diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java
index 4ccac0cfd..cf46acfb4 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java
@@ -48,7 +48,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description:
+ * Service Description: Service for doing schema-related operations.
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java
index 88af5d794..a51ede860 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java
@@ -21,7 +21,7 @@
  *
  * <p>=================== SchemaServiceClient ===================
  *
- * <p>Service Description:
+ * <p>Service Description: Service for doing schema-related operations.
  *
  * <p>Sample for SchemaServiceClient:
  *
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
index 9e0404ebc..380561fd8 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
@@ -16,11 +16,6 @@
 package com.google.pubsub.v1;
 
 import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
 
 /**
  *
@@ -475,7 +470,8 @@ public abstract static class PublisherImplBase implements io.grpc.BindableServic
     public void createTopic(
         com.google.pubsub.v1.Topic request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Topic> responseObserver) {
-      asyncUnimplementedUnaryCall(getCreateTopicMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCreateTopicMethod(), responseObserver);
     }
 
     /**
@@ -489,7 +485,8 @@ public void createTopic(
     public void updateTopic(
         com.google.pubsub.v1.UpdateTopicRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Topic> responseObserver) {
-      asyncUnimplementedUnaryCall(getUpdateTopicMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getUpdateTopicMethod(), responseObserver);
     }
 
     /**
@@ -503,7 +500,7 @@ public void updateTopic(
     public void publish(
         com.google.pubsub.v1.PublishRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.PublishResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getPublishMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getPublishMethod(), responseObserver);
     }
 
     /**
@@ -516,7 +513,7 @@ public void publish(
     public void getTopic(
         com.google.pubsub.v1.GetTopicRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Topic> responseObserver) {
-      asyncUnimplementedUnaryCall(getGetTopicMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetTopicMethod(), responseObserver);
     }
 
     /**
@@ -529,7 +526,7 @@ public void getTopic(
     public void listTopics(
         com.google.pubsub.v1.ListTopicsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListTopicsResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getListTopicsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getListTopicsMethod(), responseObserver);
     }
 
     /**
@@ -543,7 +540,8 @@ public void listTopicSubscriptions(
         com.google.pubsub.v1.ListTopicSubscriptionsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListTopicSubscriptionsResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getListTopicSubscriptionsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListTopicSubscriptionsMethod(), responseObserver);
     }
 
     /**
@@ -561,7 +559,8 @@ public void listTopicSnapshots(
         com.google.pubsub.v1.ListTopicSnapshotsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListTopicSnapshotsResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getListTopicSnapshotsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListTopicSnapshotsMethod(), responseObserver);
     }
 
     /**
@@ -578,7 +577,8 @@ public void listTopicSnapshots(
     public void deleteTopic(
         com.google.pubsub.v1.DeleteTopicRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getDeleteTopicMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDeleteTopicMethod(), responseObserver);
     }
 
     /**
@@ -595,7 +595,8 @@ public void detachSubscription(
         com.google.pubsub.v1.DetachSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.DetachSubscriptionResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getDetachSubscriptionMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDetachSubscriptionMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -603,56 +604,56 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getCreateTopicMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<com.google.pubsub.v1.Topic, com.google.pubsub.v1.Topic>(
                       this, METHODID_CREATE_TOPIC)))
           .addMethod(
               getUpdateTopicMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.UpdateTopicRequest, com.google.pubsub.v1.Topic>(
                       this, METHODID_UPDATE_TOPIC)))
           .addMethod(
               getPublishMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.PublishRequest, com.google.pubsub.v1.PublishResponse>(
                       this, METHODID_PUBLISH)))
           .addMethod(
               getGetTopicMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.GetTopicRequest, com.google.pubsub.v1.Topic>(
                       this, METHODID_GET_TOPIC)))
           .addMethod(
               getListTopicsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ListTopicsRequest,
                       com.google.pubsub.v1.ListTopicsResponse>(this, METHODID_LIST_TOPICS)))
           .addMethod(
               getListTopicSubscriptionsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ListTopicSubscriptionsRequest,
                       com.google.pubsub.v1.ListTopicSubscriptionsResponse>(
                       this, METHODID_LIST_TOPIC_SUBSCRIPTIONS)))
           .addMethod(
               getListTopicSnapshotsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ListTopicSnapshotsRequest,
                       com.google.pubsub.v1.ListTopicSnapshotsResponse>(
                       this, METHODID_LIST_TOPIC_SNAPSHOTS)))
           .addMethod(
               getDeleteTopicMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.DeleteTopicRequest, com.google.protobuf.Empty>(
                       this, METHODID_DELETE_TOPIC)))
           .addMethod(
               getDetachSubscriptionMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.DetachSubscriptionRequest,
                       com.google.pubsub.v1.DetachSubscriptionResponse>(
@@ -690,7 +691,7 @@ protected PublisherStub build(io.grpc.Channel channel, io.grpc.CallOptions callO
     public void createTopic(
         com.google.pubsub.v1.Topic request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Topic> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getCreateTopicMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -707,7 +708,7 @@ public void createTopic(
     public void updateTopic(
         com.google.pubsub.v1.UpdateTopicRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Topic> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getUpdateTopicMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -724,7 +725,7 @@ public void updateTopic(
     public void publish(
         com.google.pubsub.v1.PublishRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.PublishResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getPublishMethod(), getCallOptions()), request, responseObserver);
     }
 
@@ -738,7 +739,7 @@ public void publish(
     public void getTopic(
         com.google.pubsub.v1.GetTopicRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Topic> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getGetTopicMethod(), getCallOptions()), request, responseObserver);
     }
 
@@ -752,7 +753,7 @@ public void getTopic(
     public void listTopics(
         com.google.pubsub.v1.ListTopicsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListTopicsResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListTopicsMethod(), getCallOptions()), request, responseObserver);
     }
 
@@ -767,7 +768,7 @@ public void listTopicSubscriptions(
         com.google.pubsub.v1.ListTopicSubscriptionsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListTopicSubscriptionsResponse>
             responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListTopicSubscriptionsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -788,7 +789,7 @@ public void listTopicSnapshots(
         com.google.pubsub.v1.ListTopicSnapshotsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListTopicSnapshotsResponse>
             responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListTopicSnapshotsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -808,7 +809,7 @@ public void listTopicSnapshots(
     public void deleteTopic(
         com.google.pubsub.v1.DeleteTopicRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getDeleteTopicMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -828,7 +829,7 @@ public void detachSubscription(
         com.google.pubsub.v1.DetachSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.DetachSubscriptionResponse>
             responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getDetachSubscriptionMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -864,7 +865,8 @@ protected PublisherBlockingStub build(
      * </pre>
      */
     public com.google.pubsub.v1.Topic createTopic(com.google.pubsub.v1.Topic request) {
-      return blockingUnaryCall(getChannel(), getCreateTopicMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCreateTopicMethod(), getCallOptions(), request);
     }
 
     /**
@@ -876,7 +878,8 @@ public com.google.pubsub.v1.Topic createTopic(com.google.pubsub.v1.Topic request
      * </pre>
      */
     public com.google.pubsub.v1.Topic updateTopic(com.google.pubsub.v1.UpdateTopicRequest request) {
-      return blockingUnaryCall(getChannel(), getUpdateTopicMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getUpdateTopicMethod(), getCallOptions(), request);
     }
 
     /**
@@ -889,7 +892,8 @@ public com.google.pubsub.v1.Topic updateTopic(com.google.pubsub.v1.UpdateTopicRe
      */
     public com.google.pubsub.v1.PublishResponse publish(
         com.google.pubsub.v1.PublishRequest request) {
-      return blockingUnaryCall(getChannel(), getPublishMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getPublishMethod(), getCallOptions(), request);
     }
 
     /**
@@ -900,7 +904,8 @@ public com.google.pubsub.v1.PublishResponse publish(
      * </pre>
      */
     public com.google.pubsub.v1.Topic getTopic(com.google.pubsub.v1.GetTopicRequest request) {
-      return blockingUnaryCall(getChannel(), getGetTopicMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetTopicMethod(), getCallOptions(), request);
     }
 
     /**
@@ -912,7 +917,8 @@ public com.google.pubsub.v1.Topic getTopic(com.google.pubsub.v1.GetTopicRequest
      */
     public com.google.pubsub.v1.ListTopicsResponse listTopics(
         com.google.pubsub.v1.ListTopicsRequest request) {
-      return blockingUnaryCall(getChannel(), getListTopicsMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getListTopicsMethod(), getCallOptions(), request);
     }
 
     /**
@@ -924,7 +930,7 @@ public com.google.pubsub.v1.ListTopicsResponse listTopics(
      */
     public com.google.pubsub.v1.ListTopicSubscriptionsResponse listTopicSubscriptions(
         com.google.pubsub.v1.ListTopicSubscriptionsRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getListTopicSubscriptionsMethod(), getCallOptions(), request);
     }
 
@@ -941,7 +947,7 @@ public com.google.pubsub.v1.ListTopicSubscriptionsResponse listTopicSubscription
      */
     public com.google.pubsub.v1.ListTopicSnapshotsResponse listTopicSnapshots(
         com.google.pubsub.v1.ListTopicSnapshotsRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getListTopicSnapshotsMethod(), getCallOptions(), request);
     }
 
@@ -957,7 +963,8 @@ public com.google.pubsub.v1.ListTopicSnapshotsResponse listTopicSnapshots(
      * </pre>
      */
     public com.google.protobuf.Empty deleteTopic(com.google.pubsub.v1.DeleteTopicRequest request) {
-      return blockingUnaryCall(getChannel(), getDeleteTopicMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getDeleteTopicMethod(), getCallOptions(), request);
     }
 
     /**
@@ -972,7 +979,7 @@ public com.google.protobuf.Empty deleteTopic(com.google.pubsub.v1.DeleteTopicReq
      */
     public com.google.pubsub.v1.DetachSubscriptionResponse detachSubscription(
         com.google.pubsub.v1.DetachSubscriptionRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getDetachSubscriptionMethod(), getCallOptions(), request);
     }
   }
@@ -1006,7 +1013,7 @@ protected PublisherFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Topic>
         createTopic(com.google.pubsub.v1.Topic request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getCreateTopicMethod(), getCallOptions()), request);
     }
 
@@ -1020,7 +1027,7 @@ protected PublisherFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Topic>
         updateTopic(com.google.pubsub.v1.UpdateTopicRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getUpdateTopicMethod(), getCallOptions()), request);
     }
 
@@ -1034,7 +1041,8 @@ protected PublisherFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.PublishResponse>
         publish(com.google.pubsub.v1.PublishRequest request) {
-      return futureUnaryCall(getChannel().newCall(getPublishMethod(), getCallOptions()), request);
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getPublishMethod(), getCallOptions()), request);
     }
 
     /**
@@ -1046,7 +1054,8 @@ protected PublisherFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Topic> getTopic(
         com.google.pubsub.v1.GetTopicRequest request) {
-      return futureUnaryCall(getChannel().newCall(getGetTopicMethod(), getCallOptions()), request);
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getGetTopicMethod(), getCallOptions()), request);
     }
 
     /**
@@ -1059,7 +1068,7 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.T
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ListTopicsResponse>
         listTopics(com.google.pubsub.v1.ListTopicsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListTopicsMethod(), getCallOptions()), request);
     }
 
@@ -1073,7 +1082,7 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.T
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ListTopicSubscriptionsResponse>
         listTopicSubscriptions(com.google.pubsub.v1.ListTopicSubscriptionsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListTopicSubscriptionsMethod(), getCallOptions()), request);
     }
 
@@ -1091,7 +1100,7 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.T
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ListTopicSnapshotsResponse>
         listTopicSnapshots(com.google.pubsub.v1.ListTopicSnapshotsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListTopicSnapshotsMethod(), getCallOptions()), request);
     }
 
@@ -1108,7 +1117,7 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.T
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         deleteTopic(com.google.pubsub.v1.DeleteTopicRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getDeleteTopicMethod(), getCallOptions()), request);
     }
 
@@ -1125,7 +1134,7 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.T
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.DetachSubscriptionResponse>
         detachSubscription(com.google.pubsub.v1.DetachSubscriptionRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getDetachSubscriptionMethod(), getCallOptions()), request);
     }
   }
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java
index d68736ce2..ce5099a57 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java
@@ -16,13 +16,14 @@
 package com.google.pubsub.v1;
 
 import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
 
-/** */
+/**
+ *
+ *
+ * <pre>
+ * Service for doing schema-related operations.
+ * </pre>
+ */
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/pubsub/v1/schema.proto")
@@ -319,7 +320,13 @@ public SchemaServiceFutureStub newStub(
     return SchemaServiceFutureStub.newStub(factory, channel);
   }
 
-  /** */
+  /**
+   *
+   *
+   * <pre>
+   * Service for doing schema-related operations.
+   * </pre>
+   */
   public abstract static class SchemaServiceImplBase implements io.grpc.BindableService {
 
     /**
@@ -332,7 +339,8 @@ public abstract static class SchemaServiceImplBase implements io.grpc.BindableSe
     public void createSchema(
         com.google.pubsub.v1.CreateSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Schema> responseObserver) {
-      asyncUnimplementedUnaryCall(getCreateSchemaMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCreateSchemaMethod(), responseObserver);
     }
 
     /**
@@ -345,7 +353,7 @@ public void createSchema(
     public void getSchema(
         com.google.pubsub.v1.GetSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Schema> responseObserver) {
-      asyncUnimplementedUnaryCall(getGetSchemaMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSchemaMethod(), responseObserver);
     }
 
     /**
@@ -358,7 +366,8 @@ public void getSchema(
     public void listSchemas(
         com.google.pubsub.v1.ListSchemasRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListSchemasResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getListSchemasMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListSchemasMethod(), responseObserver);
     }
 
     /**
@@ -371,7 +380,8 @@ public void listSchemas(
     public void deleteSchema(
         com.google.pubsub.v1.DeleteSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getDeleteSchemaMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDeleteSchemaMethod(), responseObserver);
     }
 
     /**
@@ -384,7 +394,8 @@ public void deleteSchema(
     public void validateSchema(
         com.google.pubsub.v1.ValidateSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ValidateSchemaResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getValidateSchemaMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getValidateSchemaMethod(), responseObserver);
     }
 
     /**
@@ -398,7 +409,8 @@ public void validateMessage(
         com.google.pubsub.v1.ValidateMessageRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ValidateMessageResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getValidateMessageMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getValidateMessageMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -406,37 +418,37 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getCreateSchemaMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.CreateSchemaRequest, com.google.pubsub.v1.Schema>(
                       this, METHODID_CREATE_SCHEMA)))
           .addMethod(
               getGetSchemaMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.GetSchemaRequest, com.google.pubsub.v1.Schema>(
                       this, METHODID_GET_SCHEMA)))
           .addMethod(
               getListSchemasMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ListSchemasRequest,
                       com.google.pubsub.v1.ListSchemasResponse>(this, METHODID_LIST_SCHEMAS)))
           .addMethod(
               getDeleteSchemaMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.DeleteSchemaRequest, com.google.protobuf.Empty>(
                       this, METHODID_DELETE_SCHEMA)))
           .addMethod(
               getValidateSchemaMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ValidateSchemaRequest,
                       com.google.pubsub.v1.ValidateSchemaResponse>(this, METHODID_VALIDATE_SCHEMA)))
           .addMethod(
               getValidateMessageMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ValidateMessageRequest,
                       com.google.pubsub.v1.ValidateMessageResponse>(
@@ -445,7 +457,13 @@ public final io.grpc.ServerServiceDefinition bindService() {
     }
   }
 
-  /** */
+  /**
+   *
+   *
+   * <pre>
+   * Service for doing schema-related operations.
+   * </pre>
+   */
   public static final class SchemaServiceStub
       extends io.grpc.stub.AbstractAsyncStub<SchemaServiceStub> {
     private SchemaServiceStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
@@ -467,7 +485,7 @@ protected SchemaServiceStub build(io.grpc.Channel channel, io.grpc.CallOptions c
     public void createSchema(
         com.google.pubsub.v1.CreateSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Schema> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getCreateSchemaMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -483,7 +501,7 @@ public void createSchema(
     public void getSchema(
         com.google.pubsub.v1.GetSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Schema> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getGetSchemaMethod(), getCallOptions()), request, responseObserver);
     }
 
@@ -497,7 +515,7 @@ public void getSchema(
     public void listSchemas(
         com.google.pubsub.v1.ListSchemasRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListSchemasResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListSchemasMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -513,7 +531,7 @@ public void listSchemas(
     public void deleteSchema(
         com.google.pubsub.v1.DeleteSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getDeleteSchemaMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -529,7 +547,7 @@ public void deleteSchema(
     public void validateSchema(
         com.google.pubsub.v1.ValidateSchemaRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ValidateSchemaResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getValidateSchemaMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -546,14 +564,20 @@ public void validateMessage(
         com.google.pubsub.v1.ValidateMessageRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ValidateMessageResponse>
             responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getValidateMessageMethod(), getCallOptions()),
           request,
           responseObserver);
     }
   }
 
-  /** */
+  /**
+   *
+   *
+   * <pre>
+   * Service for doing schema-related operations.
+   * </pre>
+   */
   public static final class SchemaServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub<SchemaServiceBlockingStub> {
     private SchemaServiceBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
@@ -575,7 +599,8 @@ protected SchemaServiceBlockingStub build(
      */
     public com.google.pubsub.v1.Schema createSchema(
         com.google.pubsub.v1.CreateSchemaRequest request) {
-      return blockingUnaryCall(getChannel(), getCreateSchemaMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCreateSchemaMethod(), getCallOptions(), request);
     }
 
     /**
@@ -586,7 +611,8 @@ public com.google.pubsub.v1.Schema createSchema(
      * </pre>
      */
     public com.google.pubsub.v1.Schema getSchema(com.google.pubsub.v1.GetSchemaRequest request) {
-      return blockingUnaryCall(getChannel(), getGetSchemaMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetSchemaMethod(), getCallOptions(), request);
     }
 
     /**
@@ -598,7 +624,8 @@ public com.google.pubsub.v1.Schema getSchema(com.google.pubsub.v1.GetSchemaReque
      */
     public com.google.pubsub.v1.ListSchemasResponse listSchemas(
         com.google.pubsub.v1.ListSchemasRequest request) {
-      return blockingUnaryCall(getChannel(), getListSchemasMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getListSchemasMethod(), getCallOptions(), request);
     }
 
     /**
@@ -610,7 +637,8 @@ public com.google.pubsub.v1.ListSchemasResponse listSchemas(
      */
     public com.google.protobuf.Empty deleteSchema(
         com.google.pubsub.v1.DeleteSchemaRequest request) {
-      return blockingUnaryCall(getChannel(), getDeleteSchemaMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getDeleteSchemaMethod(), getCallOptions(), request);
     }
 
     /**
@@ -622,7 +650,8 @@ public com.google.protobuf.Empty deleteSchema(
      */
     public com.google.pubsub.v1.ValidateSchemaResponse validateSchema(
         com.google.pubsub.v1.ValidateSchemaRequest request) {
-      return blockingUnaryCall(getChannel(), getValidateSchemaMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getValidateSchemaMethod(), getCallOptions(), request);
     }
 
     /**
@@ -634,11 +663,18 @@ public com.google.pubsub.v1.ValidateSchemaResponse validateSchema(
      */
     public com.google.pubsub.v1.ValidateMessageResponse validateMessage(
         com.google.pubsub.v1.ValidateMessageRequest request) {
-      return blockingUnaryCall(getChannel(), getValidateMessageMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getValidateMessageMethod(), getCallOptions(), request);
     }
   }
 
-  /** */
+  /**
+   *
+   *
+   * <pre>
+   * Service for doing schema-related operations.
+   * </pre>
+   */
   public static final class SchemaServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub<SchemaServiceFutureStub> {
     private SchemaServiceFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
@@ -660,7 +696,7 @@ protected SchemaServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Schema>
         createSchema(com.google.pubsub.v1.CreateSchemaRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getCreateSchemaMethod(), getCallOptions()), request);
     }
 
@@ -673,7 +709,8 @@ protected SchemaServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Schema>
         getSchema(com.google.pubsub.v1.GetSchemaRequest request) {
-      return futureUnaryCall(getChannel().newCall(getGetSchemaMethod(), getCallOptions()), request);
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getGetSchemaMethod(), getCallOptions()), request);
     }
 
     /**
@@ -686,7 +723,7 @@ protected SchemaServiceFutureStub build(
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ListSchemasResponse>
         listSchemas(com.google.pubsub.v1.ListSchemasRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListSchemasMethod(), getCallOptions()), request);
     }
 
@@ -699,7 +736,7 @@ protected SchemaServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         deleteSchema(com.google.pubsub.v1.DeleteSchemaRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getDeleteSchemaMethod(), getCallOptions()), request);
     }
 
@@ -713,7 +750,7 @@ protected SchemaServiceFutureStub build(
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ValidateSchemaResponse>
         validateSchema(com.google.pubsub.v1.ValidateSchemaRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getValidateSchemaMethod(), getCallOptions()), request);
     }
 
@@ -727,7 +764,7 @@ protected SchemaServiceFutureStub build(
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ValidateMessageResponse>
         validateMessage(com.google.pubsub.v1.ValidateMessageRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getValidateMessageMethod(), getCallOptions()), request);
     }
   }
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
index 411cc9243..295e5e724 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
@@ -16,14 +16,6 @@
 package com.google.pubsub.v1;
 
 import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
 
 /**
  *
@@ -763,7 +755,8 @@ public abstract static class SubscriberImplBase implements io.grpc.BindableServi
     public void createSubscription(
         com.google.pubsub.v1.Subscription request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Subscription> responseObserver) {
-      asyncUnimplementedUnaryCall(getCreateSubscriptionMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCreateSubscriptionMethod(), responseObserver);
     }
 
     /**
@@ -776,7 +769,8 @@ public void createSubscription(
     public void getSubscription(
         com.google.pubsub.v1.GetSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Subscription> responseObserver) {
-      asyncUnimplementedUnaryCall(getGetSubscriptionMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getGetSubscriptionMethod(), responseObserver);
     }
 
     /**
@@ -790,7 +784,8 @@ public void getSubscription(
     public void updateSubscription(
         com.google.pubsub.v1.UpdateSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Subscription> responseObserver) {
-      asyncUnimplementedUnaryCall(getUpdateSubscriptionMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getUpdateSubscriptionMethod(), responseObserver);
     }
 
     /**
@@ -804,7 +799,8 @@ public void listSubscriptions(
         com.google.pubsub.v1.ListSubscriptionsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListSubscriptionsResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getListSubscriptionsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListSubscriptionsMethod(), responseObserver);
     }
 
     /**
@@ -821,7 +817,8 @@ public void listSubscriptions(
     public void deleteSubscription(
         com.google.pubsub.v1.DeleteSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getDeleteSubscriptionMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDeleteSubscriptionMethod(), responseObserver);
     }
 
     /**
@@ -838,7 +835,8 @@ public void deleteSubscription(
     public void modifyAckDeadline(
         com.google.pubsub.v1.ModifyAckDeadlineRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getModifyAckDeadlineMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getModifyAckDeadlineMethod(), responseObserver);
     }
 
     /**
@@ -856,7 +854,8 @@ public void modifyAckDeadline(
     public void acknowledge(
         com.google.pubsub.v1.AcknowledgeRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getAcknowledgeMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getAcknowledgeMethod(), responseObserver);
     }
 
     /**
@@ -871,7 +870,7 @@ public void acknowledge(
     public void pull(
         com.google.pubsub.v1.PullRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.PullResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getPullMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getPullMethod(), responseObserver);
     }
 
     /**
@@ -889,7 +888,8 @@ public void pull(
      */
     public io.grpc.stub.StreamObserver<com.google.pubsub.v1.StreamingPullRequest> streamingPull(
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.StreamingPullResponse> responseObserver) {
-      return asyncUnimplementedStreamingCall(getStreamingPullMethod(), responseObserver);
+      return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(
+          getStreamingPullMethod(), responseObserver);
     }
 
     /**
@@ -906,7 +906,8 @@ public io.grpc.stub.StreamObserver<com.google.pubsub.v1.StreamingPullRequest> st
     public void modifyPushConfig(
         com.google.pubsub.v1.ModifyPushConfigRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getModifyPushConfigMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getModifyPushConfigMethod(), responseObserver);
     }
 
     /**
@@ -923,7 +924,8 @@ public void modifyPushConfig(
     public void getSnapshot(
         com.google.pubsub.v1.GetSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Snapshot> responseObserver) {
-      asyncUnimplementedUnaryCall(getGetSnapshotMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getGetSnapshotMethod(), responseObserver);
     }
 
     /**
@@ -940,7 +942,8 @@ public void getSnapshot(
     public void listSnapshots(
         com.google.pubsub.v1.ListSnapshotsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListSnapshotsResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getListSnapshotsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListSnapshotsMethod(), responseObserver);
     }
 
     /**
@@ -968,7 +971,8 @@ public void listSnapshots(
     public void createSnapshot(
         com.google.pubsub.v1.CreateSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Snapshot> responseObserver) {
-      asyncUnimplementedUnaryCall(getCreateSnapshotMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCreateSnapshotMethod(), responseObserver);
     }
 
     /**
@@ -986,7 +990,8 @@ public void createSnapshot(
     public void updateSnapshot(
         com.google.pubsub.v1.UpdateSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Snapshot> responseObserver) {
-      asyncUnimplementedUnaryCall(getUpdateSnapshotMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getUpdateSnapshotMethod(), responseObserver);
     }
 
     /**
@@ -1007,7 +1012,8 @@ public void updateSnapshot(
     public void deleteSnapshot(
         com.google.pubsub.v1.DeleteSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getDeleteSnapshotMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDeleteSnapshotMethod(), responseObserver);
     }
 
     /**
@@ -1026,7 +1032,7 @@ public void deleteSnapshot(
     public void seek(
         com.google.pubsub.v1.SeekRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.SeekResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getSeekMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSeekMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -1034,98 +1040,98 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getCreateSubscriptionMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.Subscription, com.google.pubsub.v1.Subscription>(
                       this, METHODID_CREATE_SUBSCRIPTION)))
           .addMethod(
               getGetSubscriptionMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.GetSubscriptionRequest,
                       com.google.pubsub.v1.Subscription>(this, METHODID_GET_SUBSCRIPTION)))
           .addMethod(
               getUpdateSubscriptionMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.UpdateSubscriptionRequest,
                       com.google.pubsub.v1.Subscription>(this, METHODID_UPDATE_SUBSCRIPTION)))
           .addMethod(
               getListSubscriptionsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ListSubscriptionsRequest,
                       com.google.pubsub.v1.ListSubscriptionsResponse>(
                       this, METHODID_LIST_SUBSCRIPTIONS)))
           .addMethod(
               getDeleteSubscriptionMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.DeleteSubscriptionRequest, com.google.protobuf.Empty>(
                       this, METHODID_DELETE_SUBSCRIPTION)))
           .addMethod(
               getModifyAckDeadlineMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ModifyAckDeadlineRequest, com.google.protobuf.Empty>(
                       this, METHODID_MODIFY_ACK_DEADLINE)))
           .addMethod(
               getAcknowledgeMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.AcknowledgeRequest, com.google.protobuf.Empty>(
                       this, METHODID_ACKNOWLEDGE)))
           .addMethod(
               getPullMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.PullRequest, com.google.pubsub.v1.PullResponse>(
                       this, METHODID_PULL)))
           .addMethod(
               getStreamingPullMethod(),
-              asyncBidiStreamingCall(
+              io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.StreamingPullRequest,
                       com.google.pubsub.v1.StreamingPullResponse>(this, METHODID_STREAMING_PULL)))
           .addMethod(
               getModifyPushConfigMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ModifyPushConfigRequest, com.google.protobuf.Empty>(
                       this, METHODID_MODIFY_PUSH_CONFIG)))
           .addMethod(
               getGetSnapshotMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.GetSnapshotRequest, com.google.pubsub.v1.Snapshot>(
                       this, METHODID_GET_SNAPSHOT)))
           .addMethod(
               getListSnapshotsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.ListSnapshotsRequest,
                       com.google.pubsub.v1.ListSnapshotsResponse>(this, METHODID_LIST_SNAPSHOTS)))
           .addMethod(
               getCreateSnapshotMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.CreateSnapshotRequest, com.google.pubsub.v1.Snapshot>(
                       this, METHODID_CREATE_SNAPSHOT)))
           .addMethod(
               getUpdateSnapshotMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.UpdateSnapshotRequest, com.google.pubsub.v1.Snapshot>(
                       this, METHODID_UPDATE_SNAPSHOT)))
           .addMethod(
               getDeleteSnapshotMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.DeleteSnapshotRequest, com.google.protobuf.Empty>(
                       this, METHODID_DELETE_SNAPSHOT)))
           .addMethod(
               getSeekMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.pubsub.v1.SeekRequest, com.google.pubsub.v1.SeekResponse>(
                       this, METHODID_SEEK)))
@@ -1171,7 +1177,7 @@ protected SubscriberStub build(io.grpc.Channel channel, io.grpc.CallOptions call
     public void createSubscription(
         com.google.pubsub.v1.Subscription request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Subscription> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getCreateSubscriptionMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1187,7 +1193,7 @@ public void createSubscription(
     public void getSubscription(
         com.google.pubsub.v1.GetSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Subscription> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getGetSubscriptionMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1204,7 +1210,7 @@ public void getSubscription(
     public void updateSubscription(
         com.google.pubsub.v1.UpdateSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Subscription> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getUpdateSubscriptionMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1221,7 +1227,7 @@ public void listSubscriptions(
         com.google.pubsub.v1.ListSubscriptionsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListSubscriptionsResponse>
             responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListSubscriptionsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1241,7 +1247,7 @@ public void listSubscriptions(
     public void deleteSubscription(
         com.google.pubsub.v1.DeleteSubscriptionRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getDeleteSubscriptionMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1261,7 +1267,7 @@ public void deleteSubscription(
     public void modifyAckDeadline(
         com.google.pubsub.v1.ModifyAckDeadlineRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getModifyAckDeadlineMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1282,7 +1288,7 @@ public void modifyAckDeadline(
     public void acknowledge(
         com.google.pubsub.v1.AcknowledgeRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getAcknowledgeMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1300,7 +1306,7 @@ public void acknowledge(
     public void pull(
         com.google.pubsub.v1.PullRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.PullResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getPullMethod(), getCallOptions()), request, responseObserver);
     }
 
@@ -1319,7 +1325,7 @@ public void pull(
      */
     public io.grpc.stub.StreamObserver<com.google.pubsub.v1.StreamingPullRequest> streamingPull(
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.StreamingPullResponse> responseObserver) {
-      return asyncBidiStreamingCall(
+      return io.grpc.stub.ClientCalls.asyncBidiStreamingCall(
           getChannel().newCall(getStreamingPullMethod(), getCallOptions()), responseObserver);
     }
 
@@ -1337,7 +1343,7 @@ public io.grpc.stub.StreamObserver<com.google.pubsub.v1.StreamingPullRequest> st
     public void modifyPushConfig(
         com.google.pubsub.v1.ModifyPushConfigRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getModifyPushConfigMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1357,7 +1363,7 @@ public void modifyPushConfig(
     public void getSnapshot(
         com.google.pubsub.v1.GetSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Snapshot> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getGetSnapshotMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1377,7 +1383,7 @@ public void getSnapshot(
     public void listSnapshots(
         com.google.pubsub.v1.ListSnapshotsRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.ListSnapshotsResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListSnapshotsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1408,7 +1414,7 @@ public void listSnapshots(
     public void createSnapshot(
         com.google.pubsub.v1.CreateSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Snapshot> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getCreateSnapshotMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1429,7 +1435,7 @@ public void createSnapshot(
     public void updateSnapshot(
         com.google.pubsub.v1.UpdateSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.Snapshot> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getUpdateSnapshotMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1453,7 +1459,7 @@ public void updateSnapshot(
     public void deleteSnapshot(
         com.google.pubsub.v1.DeleteSnapshotRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getDeleteSnapshotMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -1475,7 +1481,7 @@ public void deleteSnapshot(
     public void seek(
         com.google.pubsub.v1.SeekRequest request,
         io.grpc.stub.StreamObserver<com.google.pubsub.v1.SeekResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getSeekMethod(), getCallOptions()), request, responseObserver);
     }
   }
@@ -1519,7 +1525,7 @@ protected SubscriberBlockingStub build(
      */
     public com.google.pubsub.v1.Subscription createSubscription(
         com.google.pubsub.v1.Subscription request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getCreateSubscriptionMethod(), getCallOptions(), request);
     }
 
@@ -1532,7 +1538,8 @@ public com.google.pubsub.v1.Subscription createSubscription(
      */
     public com.google.pubsub.v1.Subscription getSubscription(
         com.google.pubsub.v1.GetSubscriptionRequest request) {
-      return blockingUnaryCall(getChannel(), getGetSubscriptionMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetSubscriptionMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1545,7 +1552,7 @@ public com.google.pubsub.v1.Subscription getSubscription(
      */
     public com.google.pubsub.v1.Subscription updateSubscription(
         com.google.pubsub.v1.UpdateSubscriptionRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getUpdateSubscriptionMethod(), getCallOptions(), request);
     }
 
@@ -1558,7 +1565,7 @@ public com.google.pubsub.v1.Subscription updateSubscription(
      */
     public com.google.pubsub.v1.ListSubscriptionsResponse listSubscriptions(
         com.google.pubsub.v1.ListSubscriptionsRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getListSubscriptionsMethod(), getCallOptions(), request);
     }
 
@@ -1575,7 +1582,7 @@ public com.google.pubsub.v1.ListSubscriptionsResponse listSubscriptions(
      */
     public com.google.protobuf.Empty deleteSubscription(
         com.google.pubsub.v1.DeleteSubscriptionRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getDeleteSubscriptionMethod(), getCallOptions(), request);
     }
 
@@ -1592,7 +1599,7 @@ public com.google.protobuf.Empty deleteSubscription(
      */
     public com.google.protobuf.Empty modifyAckDeadline(
         com.google.pubsub.v1.ModifyAckDeadlineRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getModifyAckDeadlineMethod(), getCallOptions(), request);
     }
 
@@ -1609,7 +1616,8 @@ public com.google.protobuf.Empty modifyAckDeadline(
      * </pre>
      */
     public com.google.protobuf.Empty acknowledge(com.google.pubsub.v1.AcknowledgeRequest request) {
-      return blockingUnaryCall(getChannel(), getAcknowledgeMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getAcknowledgeMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1622,7 +1630,8 @@ public com.google.protobuf.Empty acknowledge(com.google.pubsub.v1.AcknowledgeReq
      * </pre>
      */
     public com.google.pubsub.v1.PullResponse pull(com.google.pubsub.v1.PullRequest request) {
-      return blockingUnaryCall(getChannel(), getPullMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getPullMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1638,7 +1647,7 @@ public com.google.pubsub.v1.PullResponse pull(com.google.pubsub.v1.PullRequest r
      */
     public com.google.protobuf.Empty modifyPushConfig(
         com.google.pubsub.v1.ModifyPushConfigRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getModifyPushConfigMethod(), getCallOptions(), request);
     }
 
@@ -1655,7 +1664,8 @@ public com.google.protobuf.Empty modifyPushConfig(
      */
     public com.google.pubsub.v1.Snapshot getSnapshot(
         com.google.pubsub.v1.GetSnapshotRequest request) {
-      return blockingUnaryCall(getChannel(), getGetSnapshotMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetSnapshotMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1671,7 +1681,8 @@ public com.google.pubsub.v1.Snapshot getSnapshot(
      */
     public com.google.pubsub.v1.ListSnapshotsResponse listSnapshots(
         com.google.pubsub.v1.ListSnapshotsRequest request) {
-      return blockingUnaryCall(getChannel(), getListSnapshotsMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getListSnapshotsMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1698,7 +1709,8 @@ public com.google.pubsub.v1.ListSnapshotsResponse listSnapshots(
      */
     public com.google.pubsub.v1.Snapshot createSnapshot(
         com.google.pubsub.v1.CreateSnapshotRequest request) {
-      return blockingUnaryCall(getChannel(), getCreateSnapshotMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCreateSnapshotMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1715,7 +1727,8 @@ public com.google.pubsub.v1.Snapshot createSnapshot(
      */
     public com.google.pubsub.v1.Snapshot updateSnapshot(
         com.google.pubsub.v1.UpdateSnapshotRequest request) {
-      return blockingUnaryCall(getChannel(), getUpdateSnapshotMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getUpdateSnapshotMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1735,7 +1748,8 @@ public com.google.pubsub.v1.Snapshot updateSnapshot(
      */
     public com.google.protobuf.Empty deleteSnapshot(
         com.google.pubsub.v1.DeleteSnapshotRequest request) {
-      return blockingUnaryCall(getChannel(), getDeleteSnapshotMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getDeleteSnapshotMethod(), getCallOptions(), request);
     }
 
     /**
@@ -1752,7 +1766,8 @@ public com.google.protobuf.Empty deleteSnapshot(
      * </pre>
      */
     public com.google.pubsub.v1.SeekResponse seek(com.google.pubsub.v1.SeekRequest request) {
-      return blockingUnaryCall(getChannel(), getSeekMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getSeekMethod(), getCallOptions(), request);
     }
   }
 
@@ -1794,7 +1809,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Subscription>
         createSubscription(com.google.pubsub.v1.Subscription request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getCreateSubscriptionMethod(), getCallOptions()), request);
     }
 
@@ -1807,7 +1822,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Subscription>
         getSubscription(com.google.pubsub.v1.GetSubscriptionRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getGetSubscriptionMethod(), getCallOptions()), request);
     }
 
@@ -1821,7 +1836,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Subscription>
         updateSubscription(com.google.pubsub.v1.UpdateSubscriptionRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getUpdateSubscriptionMethod(), getCallOptions()), request);
     }
 
@@ -1835,7 +1850,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ListSubscriptionsResponse>
         listSubscriptions(com.google.pubsub.v1.ListSubscriptionsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListSubscriptionsMethod(), getCallOptions()), request);
     }
 
@@ -1852,7 +1867,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         deleteSubscription(com.google.pubsub.v1.DeleteSubscriptionRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getDeleteSubscriptionMethod(), getCallOptions()), request);
     }
 
@@ -1869,7 +1884,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         modifyAckDeadline(com.google.pubsub.v1.ModifyAckDeadlineRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getModifyAckDeadlineMethod(), getCallOptions()), request);
     }
 
@@ -1887,7 +1902,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         acknowledge(com.google.pubsub.v1.AcknowledgeRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getAcknowledgeMethod(), getCallOptions()), request);
     }
 
@@ -1902,7 +1917,8 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.PullResponse>
         pull(com.google.pubsub.v1.PullRequest request) {
-      return futureUnaryCall(getChannel().newCall(getPullMethod(), getCallOptions()), request);
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getPullMethod(), getCallOptions()), request);
     }
 
     /**
@@ -1918,7 +1934,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         modifyPushConfig(com.google.pubsub.v1.ModifyPushConfigRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getModifyPushConfigMethod(), getCallOptions()), request);
     }
 
@@ -1935,7 +1951,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Snapshot>
         getSnapshot(com.google.pubsub.v1.GetSnapshotRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getGetSnapshotMethod(), getCallOptions()), request);
     }
 
@@ -1953,7 +1969,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.pubsub.v1.ListSnapshotsResponse>
         listSnapshots(com.google.pubsub.v1.ListSnapshotsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListSnapshotsMethod(), getCallOptions()), request);
     }
 
@@ -1981,7 +1997,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Snapshot>
         createSnapshot(com.google.pubsub.v1.CreateSnapshotRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getCreateSnapshotMethod(), getCallOptions()), request);
     }
 
@@ -1999,7 +2015,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Snapshot>
         updateSnapshot(com.google.pubsub.v1.UpdateSnapshotRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getUpdateSnapshotMethod(), getCallOptions()), request);
     }
 
@@ -2020,7 +2036,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         deleteSnapshot(com.google.pubsub.v1.DeleteSnapshotRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getDeleteSnapshotMethod(), getCallOptions()), request);
     }
 
@@ -2039,7 +2055,8 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.SeekResponse>
         seek(com.google.pubsub.v1.SeekRequest request) {
-      return futureUnaryCall(getChannel().newCall(getSeekMethod(), getCallOptions()), request);
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getSeekMethod(), getCallOptions()), request);
     }
   }
 
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
index 6a7449962..e993aaf10 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
@@ -454,7 +454,6 @@ public com.google.protobuf.ByteString getKmsKeyNameBytes() {
    *
    * <pre>
    * Settings for validating messages published against a schema.
-   * EXPERIMENTAL: Schema support is in development and may not work yet.
    * </pre>
    *
    * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -470,7 +469,6 @@ public boolean hasSchemaSettings() {
    *
    * <pre>
    * Settings for validating messages published against a schema.
-   * EXPERIMENTAL: Schema support is in development and may not work yet.
    * </pre>
    *
    * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -488,7 +486,6 @@ public com.google.pubsub.v1.SchemaSettings getSchemaSettings() {
    *
    * <pre>
    * Settings for validating messages published against a schema.
-   * EXPERIMENTAL: Schema support is in development and may not work yet.
    * </pre>
    *
    * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1585,7 +1582,6 @@ public Builder setKmsKeyNameBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1600,7 +1596,6 @@ public boolean hasSchemaSettings() {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1621,7 +1616,6 @@ public com.google.pubsub.v1.SchemaSettings getSchemaSettings() {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1644,7 +1638,6 @@ public Builder setSchemaSettings(com.google.pubsub.v1.SchemaSettings value) {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1664,7 +1657,6 @@ public Builder setSchemaSettings(com.google.pubsub.v1.SchemaSettings.Builder bui
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1691,7 +1683,6 @@ public Builder mergeSchemaSettings(com.google.pubsub.v1.SchemaSettings value) {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1712,7 +1703,6 @@ public Builder clearSchemaSettings() {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1727,7 +1717,6 @@ public com.google.pubsub.v1.SchemaSettings.Builder getSchemaSettingsBuilder() {
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -1746,7 +1735,6 @@ public com.google.pubsub.v1.SchemaSettingsOrBuilder getSchemaSettingsOrBuilder()
      *
      * <pre>
      * Settings for validating messages published against a schema.
-     * EXPERIMENTAL: Schema support is in development and may not work yet.
      * </pre>
      *
      * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicOrBuilder.java
index d7606f288..45838fe0f 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicOrBuilder.java
@@ -192,7 +192,6 @@ public interface TopicOrBuilder
    *
    * <pre>
    * Settings for validating messages published against a schema.
-   * EXPERIMENTAL: Schema support is in development and may not work yet.
    * </pre>
    *
    * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -205,7 +204,6 @@ public interface TopicOrBuilder
    *
    * <pre>
    * Settings for validating messages published against a schema.
-   * EXPERIMENTAL: Schema support is in development and may not work yet.
    * </pre>
    *
    * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
@@ -218,7 +216,6 @@ public interface TopicOrBuilder
    *
    * <pre>
    * Settings for validating messages published against a schema.
-   * EXPERIMENTAL: Schema support is in development and may not work yet.
    * </pre>
    *
    * <code>.google.pubsub.v1.SchemaSettings schema_settings = 6;</code>
diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
index 9bc678e3a..0da37dd7d 100644
--- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
+++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
@@ -191,8 +191,6 @@ message Topic {
   string kms_key_name = 5;
 
   // Settings for validating messages published against a schema.
-  //
-  // EXPERIMENTAL: Schema support is in development and may not work yet.
   SchemaSettings schema_settings = 6;
 
   // Reserved for future use. This field is set only in responses from the
diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto
index ae402ac4d..1ace7ef3b 100644
--- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto
+++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto
@@ -32,9 +32,6 @@ option php_namespace = "Google\\Cloud\\PubSub\\V1";
 option ruby_package = "Google::Cloud::PubSub::V1";
 
 // Service for doing schema-related operations.
-//
-// EXPERIMENTAL: The Schema service is in development and may not work yet.
-
 service SchemaService {
   option (google.api.default_host) = "pubsub.googleapis.com";
   option (google.api.oauth_scopes) =
diff --git a/synth.metadata b/synth.metadata
index 9791c3dc8..3bc62feec 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-pubsub.git",
-        "sha": "3f23ac6cda00814f74f2c435dd8a05b70ac69d27"
+        "sha": "21886d39cdc2a33275c2061578c877b0fa6aee98"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "f6dd7e47620566925a4b3f1ce029e74e1b2f2516",
-        "internalRef": "359781040"
+        "sha": "0e915217fb5261c1e57bfaf0e16ee5c7feaaba89",
+        "internalRef": "361377784"
       }
     },
     {