Do not use AutoValue shaded imports
diff --git a/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Stack.java b/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Stack.java
index 9b43eb8..a103816 100644
--- a/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Stack.java
+++ b/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Stack.java
@@ -16,10 +16,11 @@
  */
 package org.jclouds.openstack.heat.v1.domain;
 
-import autovalue.shaded.com.google.common.common.collect.ImmutableMap;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+
 import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.json.SerializedNames;
 import org.jclouds.openstack.v2_0.domain.Link;
diff --git a/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/options/UpdateStack.java b/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/options/UpdateStack.java
index b1f7640..355f767 100644
--- a/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/options/UpdateStack.java
+++ b/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/options/UpdateStack.java
@@ -16,9 +16,9 @@
  */
 package org.jclouds.openstack.heat.v1.options;
 
-
-import autovalue.shaded.com.google.common.common.collect.ImmutableMap;
 import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableMap;
+
 import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.json.SerializedNames;