diff --git a/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java b/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java
index cc84d6a..ce27036 100644
--- a/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java
+++ b/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java
@@ -18,6 +18,7 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
@@ -192,6 +193,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi
   public final OperationsClient getHttpJsonOperationsClient() {
     return httpJsonOperationsClient;
   }
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java
index 8871e99..1447fab 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.apigateway.v1.samples;
 
-// [START
-// apigateway_v1_generated_apigatewayserviceclient_createapiconfig_apinameapiconfigstring_sync]
+// [START apigateway_v1_generated_apigatewayserviceclient_createapiconfig_apinameapiconfigstring_sync]
 import com.google.cloud.apigateway.v1.ApiConfig;
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.ApiName;
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java
index e93f356..209a787 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.apigateway.v1.samples;
 
-// [START
-// apigateway_v1_generated_apigatewayserviceclient_createapiconfig_stringapiconfigstring_sync]
+// [START apigateway_v1_generated_apigatewayserviceclient_createapiconfig_stringapiconfigstring_sync]
 import com.google.cloud.apigateway.v1.ApiConfig;
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.ApiName;
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java
index 1cbccf8..cb988ad 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.apigateway.v1.samples;
 
-// [START
-// apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync]
+// [START apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync]
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.Gateway;
 import com.google.cloud.apigateway.v1.LocationName;
@@ -40,5 +39,4 @@ public static void syncCreateGatewayLocationnameGatewayString() throws Exception
     }
   }
 }
-// [END
-// apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync]
+// [END apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync]
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java
index 24f0a1a..e49cd4b 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java
@@ -20,6 +20,7 @@
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.ApiName;
 import com.google.cloud.apigateway.v1.DeleteApiRequest;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteApi {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java
index f03e8c0..4c2b9b2 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java
@@ -19,6 +19,7 @@
 // [START apigateway_v1_generated_apigatewayserviceclient_deleteapi_apiname_sync]
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.ApiName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteApiApiname {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java
index 427c4ad..4b193dc 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java
@@ -19,6 +19,7 @@
 // [START apigateway_v1_generated_apigatewayserviceclient_deleteapi_string_sync]
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.ApiName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteApiString {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java
index 2295082..cc1fd5e 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java
@@ -20,6 +20,7 @@
 import com.google.cloud.apigateway.v1.ApiConfigName;
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.DeleteApiConfigRequest;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteApiConfig {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java
index 56171c9..af07152 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java
@@ -19,6 +19,7 @@
 // [START apigateway_v1_generated_apigatewayserviceclient_deleteapiconfig_apiconfigname_sync]
 import com.google.cloud.apigateway.v1.ApiConfigName;
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteApiConfigApiconfigname {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java
index 2512af8..254df77 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java
@@ -19,6 +19,7 @@
 // [START apigateway_v1_generated_apigatewayserviceclient_deleteapiconfig_string_sync]
 import com.google.cloud.apigateway.v1.ApiConfigName;
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteApiConfigString {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java
index 69ba645..fe8f28b 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java
@@ -20,6 +20,7 @@
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.DeleteGatewayRequest;
 import com.google.cloud.apigateway.v1.GatewayName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteGateway {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java
index 317ae6e..d0fbf36 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java
@@ -19,6 +19,7 @@
 // [START apigateway_v1_generated_apigatewayserviceclient_deletegateway_gatewayname_sync]
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.GatewayName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteGatewayGatewayname {
 
diff --git a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java
index b8b8baa..80ebb31 100644
--- a/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java
+++ b/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java
@@ -19,6 +19,7 @@
 // [START apigateway_v1_generated_apigatewayserviceclient_deletegateway_string_sync]
 import com.google.cloud.apigateway.v1.ApiGatewayServiceClient;
 import com.google.cloud.apigateway.v1.GatewayName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteGatewayString {