diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java
index d1a80ce0..d4242190 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java
@@ -16,11 +16,6 @@
 package com.google.cloud.retail.v2;
 
 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;
 
 /**
  *
@@ -188,7 +183,8 @@ public void listCatalogs(
         com.google.cloud.retail.v2.ListCatalogsRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.ListCatalogsResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getListCatalogsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListCatalogsMethod(), responseObserver);
     }
 
     /**
@@ -201,7 +197,8 @@ public void listCatalogs(
     public void updateCatalog(
         com.google.cloud.retail.v2.UpdateCatalogRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Catalog> responseObserver) {
-      asyncUnimplementedUnaryCall(getUpdateCatalogMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getUpdateCatalogMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -209,14 +206,14 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getListCatalogsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.ListCatalogsRequest,
                       com.google.cloud.retail.v2.ListCatalogsResponse>(
                       this, METHODID_LIST_CATALOGS)))
           .addMethod(
               getUpdateCatalogMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.UpdateCatalogRequest,
                       com.google.cloud.retail.v2.Catalog>(this, METHODID_UPDATE_CATALOG)))
@@ -254,7 +251,7 @@ public void listCatalogs(
         com.google.cloud.retail.v2.ListCatalogsRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.ListCatalogsResponse>
             responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getListCatalogsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -270,7 +267,7 @@ public void listCatalogs(
     public void updateCatalog(
         com.google.cloud.retail.v2.UpdateCatalogRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Catalog> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getUpdateCatalogMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -306,7 +303,8 @@ protected CatalogServiceBlockingStub build(
      */
     public com.google.cloud.retail.v2.ListCatalogsResponse listCatalogs(
         com.google.cloud.retail.v2.ListCatalogsRequest request) {
-      return blockingUnaryCall(getChannel(), getListCatalogsMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getListCatalogsMethod(), getCallOptions(), request);
     }
 
     /**
@@ -318,7 +316,8 @@ public com.google.cloud.retail.v2.ListCatalogsResponse listCatalogs(
      */
     public com.google.cloud.retail.v2.Catalog updateCatalog(
         com.google.cloud.retail.v2.UpdateCatalogRequest request) {
-      return blockingUnaryCall(getChannel(), getUpdateCatalogMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getUpdateCatalogMethod(), getCallOptions(), request);
     }
   }
 
@@ -352,7 +351,7 @@ protected CatalogServiceFutureStub build(
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.cloud.retail.v2.ListCatalogsResponse>
         listCatalogs(com.google.cloud.retail.v2.ListCatalogsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListCatalogsMethod(), getCallOptions()), request);
     }
 
@@ -365,7 +364,7 @@ protected CatalogServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.retail.v2.Catalog>
         updateCatalog(com.google.cloud.retail.v2.UpdateCatalogRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getUpdateCatalogMethod(), getCallOptions()), request);
     }
   }
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceGrpc.java
index 1548b2d3..039f935f 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceGrpc.java
@@ -16,11 +16,6 @@
 package com.google.cloud.retail.v2;
 
 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;
 
 /**
  *
@@ -140,7 +135,7 @@ public abstract static class PredictionServiceImplBase implements io.grpc.Bindab
     public void predict(
         com.google.cloud.retail.v2.PredictRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.PredictResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getPredictMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getPredictMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -148,7 +143,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getPredictMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.PredictRequest,
                       com.google.cloud.retail.v2.PredictResponse>(this, METHODID_PREDICT)))
@@ -185,7 +180,7 @@ protected PredictionServiceStub build(
     public void predict(
         com.google.cloud.retail.v2.PredictRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.PredictResponse> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getPredictMethod(), getCallOptions()), request, responseObserver);
     }
   }
@@ -219,7 +214,8 @@ protected PredictionServiceBlockingStub build(
      */
     public com.google.cloud.retail.v2.PredictResponse predict(
         com.google.cloud.retail.v2.PredictRequest request) {
-      return blockingUnaryCall(getChannel(), getPredictMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getPredictMethod(), getCallOptions(), request);
     }
   }
 
@@ -252,7 +248,8 @@ protected PredictionServiceFutureStub build(
     public com.google.common.util.concurrent.ListenableFuture<
             com.google.cloud.retail.v2.PredictResponse>
         predict(com.google.cloud.retail.v2.PredictRequest request) {
-      return futureUnaryCall(getChannel().newCall(getPredictMethod(), getCallOptions()), request);
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getPredictMethod(), getCallOptions()), request);
     }
   }
 
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java
index 33272d71..005a74f1 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java
@@ -16,11 +16,6 @@
 package com.google.cloud.retail.v2;
 
 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;
 
 /**
  *
@@ -310,7 +305,8 @@ public abstract static class ProductServiceImplBase implements io.grpc.BindableS
     public void createProduct(
         com.google.cloud.retail.v2.CreateProductRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Product> responseObserver) {
-      asyncUnimplementedUnaryCall(getCreateProductMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCreateProductMethod(), responseObserver);
     }
 
     /**
@@ -323,7 +319,7 @@ public void createProduct(
     public void getProduct(
         com.google.cloud.retail.v2.GetProductRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Product> responseObserver) {
-      asyncUnimplementedUnaryCall(getGetProductMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetProductMethod(), responseObserver);
     }
 
     /**
@@ -336,7 +332,8 @@ public void getProduct(
     public void updateProduct(
         com.google.cloud.retail.v2.UpdateProductRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Product> responseObserver) {
-      asyncUnimplementedUnaryCall(getUpdateProductMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getUpdateProductMethod(), responseObserver);
     }
 
     /**
@@ -349,7 +346,8 @@ public void updateProduct(
     public void deleteProduct(
         com.google.cloud.retail.v2.DeleteProductRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnimplementedUnaryCall(getDeleteProductMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDeleteProductMethod(), responseObserver);
     }
 
     /**
@@ -366,7 +364,8 @@ public void deleteProduct(
     public void importProducts(
         com.google.cloud.retail.v2.ImportProductsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnimplementedUnaryCall(getImportProductsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getImportProductsMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -374,31 +373,31 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getCreateProductMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.CreateProductRequest,
                       com.google.cloud.retail.v2.Product>(this, METHODID_CREATE_PRODUCT)))
           .addMethod(
               getGetProductMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.GetProductRequest,
                       com.google.cloud.retail.v2.Product>(this, METHODID_GET_PRODUCT)))
           .addMethod(
               getUpdateProductMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.UpdateProductRequest,
                       com.google.cloud.retail.v2.Product>(this, METHODID_UPDATE_PRODUCT)))
           .addMethod(
               getDeleteProductMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.DeleteProductRequest, com.google.protobuf.Empty>(
                       this, METHODID_DELETE_PRODUCT)))
           .addMethod(
               getImportProductsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.ImportProductsRequest,
                       com.google.longrunning.Operation>(this, METHODID_IMPORT_PRODUCTS)))
@@ -435,7 +434,7 @@ protected ProductServiceStub build(io.grpc.Channel channel, io.grpc.CallOptions
     public void createProduct(
         com.google.cloud.retail.v2.CreateProductRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Product> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getCreateProductMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -451,7 +450,7 @@ public void createProduct(
     public void getProduct(
         com.google.cloud.retail.v2.GetProductRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Product> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getGetProductMethod(), getCallOptions()), request, responseObserver);
     }
 
@@ -465,7 +464,7 @@ public void getProduct(
     public void updateProduct(
         com.google.cloud.retail.v2.UpdateProductRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.Product> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getUpdateProductMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -481,7 +480,7 @@ public void updateProduct(
     public void deleteProduct(
         com.google.cloud.retail.v2.DeleteProductRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getDeleteProductMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -501,7 +500,7 @@ public void deleteProduct(
     public void importProducts(
         com.google.cloud.retail.v2.ImportProductsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getImportProductsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -537,7 +536,8 @@ protected ProductServiceBlockingStub build(
      */
     public com.google.cloud.retail.v2.Product createProduct(
         com.google.cloud.retail.v2.CreateProductRequest request) {
-      return blockingUnaryCall(getChannel(), getCreateProductMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCreateProductMethod(), getCallOptions(), request);
     }
 
     /**
@@ -549,7 +549,8 @@ public com.google.cloud.retail.v2.Product createProduct(
      */
     public com.google.cloud.retail.v2.Product getProduct(
         com.google.cloud.retail.v2.GetProductRequest request) {
-      return blockingUnaryCall(getChannel(), getGetProductMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetProductMethod(), getCallOptions(), request);
     }
 
     /**
@@ -561,7 +562,8 @@ public com.google.cloud.retail.v2.Product getProduct(
      */
     public com.google.cloud.retail.v2.Product updateProduct(
         com.google.cloud.retail.v2.UpdateProductRequest request) {
-      return blockingUnaryCall(getChannel(), getUpdateProductMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getUpdateProductMethod(), getCallOptions(), request);
     }
 
     /**
@@ -573,7 +575,8 @@ public com.google.cloud.retail.v2.Product updateProduct(
      */
     public com.google.protobuf.Empty deleteProduct(
         com.google.cloud.retail.v2.DeleteProductRequest request) {
-      return blockingUnaryCall(getChannel(), getDeleteProductMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getDeleteProductMethod(), getCallOptions(), request);
     }
 
     /**
@@ -589,7 +592,8 @@ public com.google.protobuf.Empty deleteProduct(
      */
     public com.google.longrunning.Operation importProducts(
         com.google.cloud.retail.v2.ImportProductsRequest request) {
-      return blockingUnaryCall(getChannel(), getImportProductsMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getImportProductsMethod(), getCallOptions(), request);
     }
   }
 
@@ -622,7 +626,7 @@ protected ProductServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.retail.v2.Product>
         createProduct(com.google.cloud.retail.v2.CreateProductRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getCreateProductMethod(), getCallOptions()), request);
     }
 
@@ -635,7 +639,7 @@ protected ProductServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.retail.v2.Product>
         getProduct(com.google.cloud.retail.v2.GetProductRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getGetProductMethod(), getCallOptions()), request);
     }
 
@@ -648,7 +652,7 @@ protected ProductServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.retail.v2.Product>
         updateProduct(com.google.cloud.retail.v2.UpdateProductRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getUpdateProductMethod(), getCallOptions()), request);
     }
 
@@ -661,7 +665,7 @@ protected ProductServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
         deleteProduct(com.google.cloud.retail.v2.DeleteProductRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getDeleteProductMethod(), getCallOptions()), request);
     }
 
@@ -678,7 +682,7 @@ protected ProductServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
         importProducts(com.google.cloud.retail.v2.ImportProductsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getImportProductsMethod(), getCallOptions()), request);
     }
   }
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceGrpc.java
index 827caba3..8a9d2613 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceGrpc.java
@@ -16,11 +16,6 @@
 package com.google.cloud.retail.v2;
 
 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;
 
 /**
  *
@@ -313,7 +308,8 @@ public abstract static class UserEventServiceImplBase implements io.grpc.Bindabl
     public void writeUserEvent(
         com.google.cloud.retail.v2.WriteUserEventRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.UserEvent> responseObserver) {
-      asyncUnimplementedUnaryCall(getWriteUserEventMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getWriteUserEventMethod(), responseObserver);
     }
 
     /**
@@ -329,7 +325,8 @@ public void writeUserEvent(
     public void collectUserEvent(
         com.google.cloud.retail.v2.CollectUserEventRequest request,
         io.grpc.stub.StreamObserver<com.google.api.HttpBody> responseObserver) {
-      asyncUnimplementedUnaryCall(getCollectUserEventMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCollectUserEventMethod(), responseObserver);
     }
 
     /**
@@ -345,7 +342,8 @@ public void collectUserEvent(
     public void purgeUserEvents(
         com.google.cloud.retail.v2.PurgeUserEventsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnimplementedUnaryCall(getPurgeUserEventsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getPurgeUserEventsMethod(), responseObserver);
     }
 
     /**
@@ -363,7 +361,8 @@ public void purgeUserEvents(
     public void importUserEvents(
         com.google.cloud.retail.v2.ImportUserEventsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnimplementedUnaryCall(getImportUserEventsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getImportUserEventsMethod(), responseObserver);
     }
 
     /**
@@ -382,7 +381,8 @@ public void importUserEvents(
     public void rejoinUserEvents(
         com.google.cloud.retail.v2.RejoinUserEventsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnimplementedUnaryCall(getRejoinUserEventsMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getRejoinUserEventsMethod(), responseObserver);
     }
 
     @java.lang.Override
@@ -390,31 +390,31 @@ public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
               getWriteUserEventMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.WriteUserEventRequest,
                       com.google.cloud.retail.v2.UserEvent>(this, METHODID_WRITE_USER_EVENT)))
           .addMethod(
               getCollectUserEventMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.CollectUserEventRequest, com.google.api.HttpBody>(
                       this, METHODID_COLLECT_USER_EVENT)))
           .addMethod(
               getPurgeUserEventsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.PurgeUserEventsRequest,
                       com.google.longrunning.Operation>(this, METHODID_PURGE_USER_EVENTS)))
           .addMethod(
               getImportUserEventsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.ImportUserEventsRequest,
                       com.google.longrunning.Operation>(this, METHODID_IMPORT_USER_EVENTS)))
           .addMethod(
               getRejoinUserEventsMethod(),
-              asyncUnaryCall(
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
                   new MethodHandlers<
                       com.google.cloud.retail.v2.RejoinUserEventsRequest,
                       com.google.longrunning.Operation>(this, METHODID_REJOIN_USER_EVENTS)))
@@ -450,7 +450,7 @@ protected UserEventServiceStub build(io.grpc.Channel channel, io.grpc.CallOption
     public void writeUserEvent(
         com.google.cloud.retail.v2.WriteUserEventRequest request,
         io.grpc.stub.StreamObserver<com.google.cloud.retail.v2.UserEvent> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getWriteUserEventMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -469,7 +469,7 @@ public void writeUserEvent(
     public void collectUserEvent(
         com.google.cloud.retail.v2.CollectUserEventRequest request,
         io.grpc.stub.StreamObserver<com.google.api.HttpBody> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getCollectUserEventMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -488,7 +488,7 @@ public void collectUserEvent(
     public void purgeUserEvents(
         com.google.cloud.retail.v2.PurgeUserEventsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getPurgeUserEventsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -509,7 +509,7 @@ public void purgeUserEvents(
     public void importUserEvents(
         com.google.cloud.retail.v2.ImportUserEventsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getImportUserEventsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -531,7 +531,7 @@ public void importUserEvents(
     public void rejoinUserEvents(
         com.google.cloud.retail.v2.RejoinUserEventsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
-      asyncUnaryCall(
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
           getChannel().newCall(getRejoinUserEventsMethod(), getCallOptions()),
           request,
           responseObserver);
@@ -566,7 +566,8 @@ protected UserEventServiceBlockingStub build(
      */
     public com.google.cloud.retail.v2.UserEvent writeUserEvent(
         com.google.cloud.retail.v2.WriteUserEventRequest request) {
-      return blockingUnaryCall(getChannel(), getWriteUserEventMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getWriteUserEventMethod(), getCallOptions(), request);
     }
 
     /**
@@ -581,7 +582,7 @@ public com.google.cloud.retail.v2.UserEvent writeUserEvent(
      */
     public com.google.api.HttpBody collectUserEvent(
         com.google.cloud.retail.v2.CollectUserEventRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getCollectUserEventMethod(), getCallOptions(), request);
     }
 
@@ -597,7 +598,8 @@ public com.google.api.HttpBody collectUserEvent(
      */
     public com.google.longrunning.Operation purgeUserEvents(
         com.google.cloud.retail.v2.PurgeUserEventsRequest request) {
-      return blockingUnaryCall(getChannel(), getPurgeUserEventsMethod(), getCallOptions(), request);
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getPurgeUserEventsMethod(), getCallOptions(), request);
     }
 
     /**
@@ -614,7 +616,7 @@ public com.google.longrunning.Operation purgeUserEvents(
      */
     public com.google.longrunning.Operation importUserEvents(
         com.google.cloud.retail.v2.ImportUserEventsRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getImportUserEventsMethod(), getCallOptions(), request);
     }
 
@@ -633,7 +635,7 @@ public com.google.longrunning.Operation importUserEvents(
      */
     public com.google.longrunning.Operation rejoinUserEvents(
         com.google.cloud.retail.v2.RejoinUserEventsRequest request) {
-      return blockingUnaryCall(
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getRejoinUserEventsMethod(), getCallOptions(), request);
     }
   }
@@ -666,7 +668,7 @@ protected UserEventServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.retail.v2.UserEvent>
         writeUserEvent(com.google.cloud.retail.v2.WriteUserEventRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getWriteUserEventMethod(), getCallOptions()), request);
     }
 
@@ -682,7 +684,7 @@ protected UserEventServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.api.HttpBody>
         collectUserEvent(com.google.cloud.retail.v2.CollectUserEventRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getCollectUserEventMethod(), getCallOptions()), request);
     }
 
@@ -698,7 +700,7 @@ protected UserEventServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
         purgeUserEvents(com.google.cloud.retail.v2.PurgeUserEventsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getPurgeUserEventsMethod(), getCallOptions()), request);
     }
 
@@ -716,7 +718,7 @@ protected UserEventServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
         importUserEvents(com.google.cloud.retail.v2.ImportUserEventsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getImportUserEventsMethod(), getCallOptions()), request);
     }
 
@@ -735,7 +737,7 @@ protected UserEventServiceFutureStub build(
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
         rejoinUserEvents(com.google.cloud.retail.v2.RejoinUserEventsRequest request) {
-      return futureUnaryCall(
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getRejoinUserEventsMethod(), getCallOptions()), request);
     }
   }
diff --git a/synth.metadata b/synth.metadata
index 0b514a32..c93078c0 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-retail.git",
-        "sha": "c06265229f54484dc9f0e62e6245f77568d9dc2c"
+        "sha": "df845cc8955b64a3b6280f56563f6f56399e8a5a"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "3befd26ca55723d3e8111909331eac1249837987",
-        "internalRef": "360805639"
+        "sha": "0e915217fb5261c1e57bfaf0e16ee5c7feaaba89",
+        "internalRef": "361377784"
       }
     },
     {