diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java
index c54fe6d07952..c07d7f6b5c12 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java
@@ -22,8 +22,8 @@
 import com.google.cloud.RestorableState;
 import com.google.cloud.RetryHelper;
 import com.google.cloud.WriteChannel;
-import com.google.common.base.MoreObjects;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 
@@ -149,8 +149,10 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected MoreObjects.ToStringHelper toStringHelper() {
-      return super.toStringHelper().add("job", job);
+    protected List<ValueHolder> toStringHelper() {
+      List<ValueHolder> valueList = super.toStringHelper();
+      valueList.add(ValueHolder.create("job", job));
+      return valueList;
     }
   }
 }
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java
index ff77f0b96ab6..f1016bb267cb 100644
--- a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java
+++ b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java
@@ -18,10 +18,10 @@
 
 import com.google.cloud.storage.Acl;
 import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableMap;
 
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Interface for attributes on a Cloud Storage file or pseudo-directory.
@@ -75,5 +75,5 @@ public interface CloudStorageFileAttributes extends BasicFileAttributes {
    *
    * @see "https://developers.google.com/storage/docs/reference-headers#contentdisposition"
    */
-  ImmutableMap<String, String> userMetadata();
+  Map<String, String> userMetadata();
 }
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
index 4f031c92f740..49f1772e90b7 100644
--- a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
+++ b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
@@ -56,7 +56,7 @@ public final class CloudStorageFileSystem extends FileSystem {
   public static final String BASIC_VIEW = "basic";
   public static final int BLOCK_SIZE_DEFAULT = 2 * 1024 * 1024;
   public static final FileTime FILE_TIME_UNKNOWN = FileTime.fromMillis(0);
-  public static final ImmutableSet<String> SUPPORTED_VIEWS = ImmutableSet.of(BASIC_VIEW, GCS_VIEW);
+  public static final Set<String> SUPPORTED_VIEWS = ImmutableSet.of(BASIC_VIEW, GCS_VIEW);
 
   private final CloudStorageFileSystemProvider provider;
   private final String bucket;
diff --git a/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java b/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java
index ddc191b1e439..fd8f02d19589 100644
--- a/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java
+++ b/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java
@@ -16,13 +16,13 @@
 
 package com.google.cloud;
 
-import com.google.common.base.MoreObjects;
-
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -295,17 +295,54 @@ public boolean equals(Object obj) {
           && this.chunkSize == other.chunkSize;
     }
 
-    protected MoreObjects.ToStringHelper toStringHelper() {
-      return MoreObjects.toStringHelper(this)
-          .add("entity", entity)
-          .add("uploadId", uploadId)
-          .add("position", position)
-          .add("isOpen", isOpen);
+    protected static final class ValueHolder {
+      final String name;
+      final Object value;
+
+      private ValueHolder(String name, Object value) {
+        this.name = name;
+        this.value = value;
+      }
+
+      public static ValueHolder create(String name, Object value) {
+        return new ValueHolder(name, value);
+      }
+
+      @Override
+      public String toString() {
+        String result = name + "=";
+        if (value != null && value.getClass().isArray()) {
+          Object[] objectArray = new Object[]{value};
+          String arrayString = Arrays.deepToString(objectArray);
+          result += arrayString.substring(1, arrayString.length() - 1);
+        } else {
+          result += value;
+        }
+        return result;
+      }
+    }
+
+    protected List<ValueHolder> toStringHelper() {
+      List<ValueHolder> valueList = new ArrayList<>();
+      valueList.add(ValueHolder.create("entity", entity));
+      valueList.add(ValueHolder.create("uploadId", uploadId));
+      valueList.add(ValueHolder.create("position", String.valueOf(position)));
+      valueList.add(ValueHolder.create("isOpen", String.valueOf(isOpen)));
+      return valueList;
     }
 
     @Override
     public String toString() {
-      return toStringHelper().toString();
+      StringBuilder builder = new StringBuilder();
+      builder.append(getClass().getSimpleName())
+          .append('{');
+      String nextSeparator = "";
+      for (ValueHolder valueHolder : toStringHelper()) {
+        builder.append(nextSeparator).append(valueHolder);
+        nextSeparator = ", ";
+      }
+      builder.append('}');
+      return builder.toString();
     }
   }
 }
diff --git a/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java b/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
index d4529124c839..e7789d31af95 100644
--- a/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
+++ b/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.core.ApiFunction;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Iterables;
@@ -37,9 +38,9 @@
 public class MonitoredResourceDescriptor implements Serializable {
 
   private static final long serialVersionUID = -3702077512777687441L;
-  public static final Function<com.google.api.MonitoredResourceDescriptor,
+  public static final ApiFunction<com.google.api.MonitoredResourceDescriptor,
       MonitoredResourceDescriptor> FROM_PB_FUNCTION =
-      new Function<com.google.api.MonitoredResourceDescriptor, MonitoredResourceDescriptor>() {
+      new ApiFunction<com.google.api.MonitoredResourceDescriptor, MonitoredResourceDescriptor>() {
         @Override
         public MonitoredResourceDescriptor apply(
             com.google.api.MonitoredResourceDescriptor pb) {
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Policy.java b/google-cloud-core/src/main/java/com/google/cloud/Policy.java
index 7f918767d582..ca7993668454 100644
--- a/google-cloud-core/src/main/java/com/google/cloud/Policy.java
+++ b/google-cloud-core/src/main/java/com/google/cloud/Policy.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.core.ApiFunction;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
@@ -57,15 +58,15 @@ public final class Policy implements Serializable {
 
   public abstract static class Marshaller<T> {
 
-    protected static final Function<String, Identity> IDENTITY_VALUE_OF_FUNCTION =
-        new Function<String, Identity>() {
+    protected static final ApiFunction<String, Identity> IDENTITY_VALUE_OF_FUNCTION =
+        new ApiFunction<String, Identity>() {
           @Override
           public Identity apply(String identityPb) {
             return Identity.valueOf(identityPb);
           }
         };
-    protected static final Function<Identity, String> IDENTITY_STR_VALUE_FUNCTION =
-        new Function<Identity, String>() {
+    protected static final ApiFunction<Identity, String> IDENTITY_STR_VALUE_FUNCTION =
+        new ApiFunction<Identity, String>() {
           @Override
           public String apply(Identity identity) {
             return identity.strValue();
@@ -85,7 +86,12 @@ protected Policy fromPb(com.google.iam.v1.Policy policyPb) {
       for (com.google.iam.v1.Binding bindingPb : policyPb.getBindingsList()) {
         bindings.put(Role.of(bindingPb.getRole()),
             ImmutableSet.copyOf(
-                Lists.transform(bindingPb.getMembersList(), IDENTITY_VALUE_OF_FUNCTION)));
+                Lists.transform(bindingPb.getMembersList(), new Function<String, Identity>() {
+                  @Override
+                  public Identity apply(String s) {
+                    return IDENTITY_VALUE_OF_FUNCTION.apply(s);
+                  }
+                })));
       }
       return newBuilder()
           .setBindings(bindings)
@@ -103,7 +109,12 @@ protected com.google.iam.v1.Policy toPb(Policy policy) {
         com.google.iam.v1.Binding.Builder bindingBuilder = com.google.iam.v1.Binding.newBuilder();
         bindingBuilder.setRole(binding.getKey().getValue());
         bindingBuilder.addAllMembers(
-            Lists.transform(new ArrayList<>(binding.getValue()), IDENTITY_STR_VALUE_FUNCTION));
+            Lists.transform(new ArrayList<>(binding.getValue()), new Function<Identity, String>() {
+              @Override
+              public String apply(Identity identity) {
+                return IDENTITY_STR_VALUE_FUNCTION.apply(identity);
+              }
+            }));
         bindingPbList.add(bindingBuilder.build());
       }
       policyBuilder.addAllBindings(bindingPbList);
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 9cf92a9d8354..91d5c8cd5962 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -1006,7 +1006,7 @@ public List<String> getDistinctOn() {
   /**
    * Returns the order by clause for this query.
    */
-  public ImmutableList<OrderBy> getOrderBy() {
+  public List<OrderBy> getOrderBy() {
     return orderBy;
   }
 
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java
index cfdc13280011..d9957280cd12 100644
--- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java
+++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java
@@ -36,6 +36,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -120,7 +121,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java
index a88ec3c430e4..2a19501bcff6 100644
--- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java
+++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java
@@ -51,6 +51,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -155,7 +156,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java
index c01a5e3af665..0345a85d1b43 100644
--- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java
+++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java
@@ -35,6 +35,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -110,7 +111,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java b/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java
index 040b185887ee..4280c9977030 100644
--- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java
+++ b/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java
@@ -41,6 +41,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -156,7 +157,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java b/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java
index bedbfc8234e3..5d7513a91353 100644
--- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java
+++ b/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java
@@ -43,6 +43,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -176,7 +177,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
index 72fb9f878eec..309bffefcaef 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
@@ -369,7 +369,13 @@ public AsyncPage<MonitoredResourceDescriptor> apply(
                 listDescriptorsResponse.getResourceDescriptorsList() == null
                     ? ImmutableList.<MonitoredResourceDescriptor>of()
                     : Lists.transform(listDescriptorsResponse.getResourceDescriptorsList(),
-                MonitoredResourceDescriptor.FROM_PB_FUNCTION);
+                        new Function<com.google.api.MonitoredResourceDescriptor, MonitoredResourceDescriptor>() {
+                          @Override
+                          public MonitoredResourceDescriptor apply(
+                              com.google.api.MonitoredResourceDescriptor monitoredResourceDescriptor) {
+                            return MonitoredResourceDescriptor.FROM_PB_FUNCTION.apply(monitoredResourceDescriptor);
+                          }
+                        });
             String cursor = listDescriptorsResponse.getNextPageToken().equals("") ? null
                 : listDescriptorsResponse.getNextPageToken();
             return new AsyncPageImpl<>(
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java
index 0232e968df7a..e819db077bf7 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java
@@ -50,6 +50,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -176,7 +177,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
index ba5cfb9c6b28..0f620065ff64 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
@@ -65,6 +65,7 @@
 import io.grpc.Status;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -209,7 +210,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java
index 0c1fd904623c..ce922b31e044 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java
@@ -50,6 +50,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -182,7 +183,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
index fda1786f9a9b..a5ba6c5cde24 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
@@ -54,6 +54,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -197,7 +198,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java
index c19de5268f4d..bdc30551a7d6 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java
@@ -59,6 +59,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -261,7 +262,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java
index c7635657872a..e4d642be0326 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java
@@ -70,6 +70,7 @@
 import com.google.pubsub.v1.UpdateSubscriptionRequest;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -364,7 +365,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
index 1442727cdd09..e2096cbb2423 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
@@ -256,7 +256,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
index b0c1f459bc46..fbf525ff17e6 100644
--- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
+++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
@@ -21,6 +21,7 @@
 import com.google.cloud.Policy;
 import com.google.cloud.Policy.Marshaller;
 import com.google.cloud.Role;
+import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 
@@ -55,7 +56,12 @@ protected Policy fromPb(com.google.api.services.cloudresourcemanager.model.Polic
     if (policyPb.getBindings() != null) {
       for (Binding bindingPb : policyPb.getBindings()) {
         bindings.put(Role.of(bindingPb.getRole()), ImmutableSet.copyOf(
-            Lists.transform(bindingPb.getMembers(), IDENTITY_VALUE_OF_FUNCTION)));
+            Lists.transform(bindingPb.getMembers(), new Function<String, Identity>() {
+              @Override
+              public Identity apply(String s) {
+                return IDENTITY_VALUE_OF_FUNCTION.apply(s);
+              }
+            })));
       }
     }
     return new Builder(bindings, policyPb.getEtag(), policyPb.getVersion()).build();
@@ -71,7 +77,12 @@ protected com.google.api.services.cloudresourcemanager.model.Policy toPb(Policy
       Binding bindingPb = new Binding();
       bindingPb.setRole(binding.getKey().getValue());
       bindingPb.setMembers(
-          Lists.transform(new ArrayList<>(binding.getValue()), IDENTITY_STR_VALUE_FUNCTION));
+          Lists.transform(new ArrayList<>(binding.getValue()), new Function<Identity, String>() {
+            @Override
+            public String apply(Identity identity) {
+              return IDENTITY_STR_VALUE_FUNCTION.apply(identity);
+            }
+          }));
       bindingPbList.add(bindingPb);
     }
     policyPb.setBindings(bindingPbList);
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java
index bba232f985ce..fe005bccdbf6 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java
@@ -186,7 +186,7 @@ public State getState() {
   }
 
   /** Returns the cloud labels attached to this instance. */
-  public ImmutableMap<String, String> getLabels() {
+  public Map<String, String> getLabels() {
     return labels;
   }
 
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java
index 434a1222fbdc..1f950d5df654 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java
@@ -16,8 +16,8 @@
 
 package com.google.cloud.spanner;
 
+import com.google.api.core.ApiFuture;
 import com.google.cloud.Service;
-import com.google.common.util.concurrent.ListenableFuture;
 
 /** An interface for Cloud Spanner. */
 public interface Spanner extends Service<SpannerOptions> {
@@ -38,5 +38,5 @@ public interface Spanner extends Service<SpannerOptions> {
    * method does not block. Return future will complete when cleanup is done. TODO(user): Add
    * logging and tracking of leaked sessions.
    */
-  ListenableFuture<Void> closeAsync();
+  ApiFuture<Void> closeAsync();
 }
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
index 77225fc273da..7168834777d0 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -26,6 +26,8 @@
 
 import com.google.api.client.util.BackOff;
 import com.google.api.client.util.ExponentialBackOff;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.ListenableFutureToApiFuture;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.cloud.BaseService;
 import com.google.cloud.ByteArray;
@@ -250,7 +252,7 @@ public DatabaseClient getDatabaseClient(DatabaseId db) {
   }
 
   @Override
-  public ListenableFuture<Void> closeAsync() {
+  public ApiFuture<Void> closeAsync() {
     List<ListenableFuture<Void>> closureFutures = null;
     synchronized (this) {
       Preconditions.checkState(!spannerIsClosed, "Cloud Spanner client has been closed");
@@ -261,7 +263,7 @@ public ListenableFuture<Void> closeAsync() {
       }
       dbClients.clear();
     }
-    return transform(
+    return new ListenableFutureToApiFuture<>(transform(
         Futures.successfulAsList(closureFutures),
         new Function<List<Void>, Void>() {
           @Override
@@ -272,7 +274,7 @@ public Void apply(List<Void> inputs) {
             return null;
           }
         },
-        directExecutor());
+        directExecutor()));
   }
 
   /**
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java
index 2af3a9c1a31f..ad34b9acae39 100644
--- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java
+++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java
@@ -42,6 +42,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -146,7 +147,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java
index d5375aa1f766..c1e1a382b892 100644
--- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java
+++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java
@@ -42,6 +42,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -146,7 +147,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java
index 510ff151c941..e88a46d11355 100644
--- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java
+++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java
@@ -43,10 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  public void setResponses(List<GeneratedMessageV3> responses) {
-    serviceImpl.setResponses(responses);
-  }
-
   @Override
   public ServerServiceDefinition getServiceDefinition() {
     return serviceImpl.bindService();
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java
index f2d689bbe259..414b4daa4088 100644
--- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java
+++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java
@@ -48,6 +48,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -148,7 +149,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }
 
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java
index 0addbd4bea66..28558e3aaef9 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java
@@ -35,6 +35,7 @@
 import com.google.protobuf.ExperimentalApi;
 import io.grpc.Status;
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Generated;
 import org.joda.time.Duration;
 
@@ -110,7 +111,7 @@ public static String getDefaultEndpoint() {
   }
 
   /** Returns the default service scopes. */
-  public static ImmutableList<String> getDefaultServiceScopes() {
+  public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
   }