diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 9786771c..9351fdfb 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
+  digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 15aa5255..3cba83c1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few
 - [ ] Appropriate docs were updated (if necessary)
 
 Fixes #<issue_number_goes_here> ☕️
+
+If you write sample code, please follow the [samples format](
+https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0154bcd2..c68be201 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.1.7](https://github.com/googleapis/java-appengine-admin/compare/v2.1.6...v2.1.7) (2022-02-28)
+
+
+### Dependencies
+
+* update actions/setup-java action to v3 ([#201](https://github.com/googleapis/java-appengine-admin/issues/201)) ([0a485ac](https://github.com/googleapis/java-appengine-admin/commit/0a485aca0e9b93159c7c6cbf064a4abb48078525))
+
 ### [2.1.6](https://github.com/googleapis/java-appengine-admin/compare/v2.1.5...v2.1.6) (2022-02-11)
 
 
diff --git a/README.md b/README.md
index 73bea33f..f47631f7 100644
--- a/README.md
+++ b/README.md
@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-appengine-admin</artifactId>
-  <version>2.1.5</version>
+  <version>2.1.6</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-appengine-admin:2.1.5'
+implementation 'com.google.cloud:google-cloud-appengine-admin:2.1.6'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "2.1.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "2.1.6"
 ```
 
 ## Authentication
diff --git a/google-cloud-appengine-admin-bom/pom.xml b/google-cloud-appengine-admin-bom/pom.xml
index d3a39c48..d154e0b8 100644
--- a/google-cloud-appengine-admin-bom/pom.xml
+++ b/google-cloud-appengine-admin-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-appengine-admin-bom</artifactId>
-  <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+  <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -56,17 +56,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-appengine-admin</artifactId>
-        <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+        <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-appengine-admin-v1</artifactId>
-        <version>2.1.6</version><!-- {x-version-update:grpc-google-cloud-appengine-admin-v1:current} -->
+        <version>2.1.7</version><!-- {x-version-update:grpc-google-cloud-appengine-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-appengine-admin-v1</artifactId>
-        <version>2.1.6</version><!-- {x-version-update:proto-google-cloud-appengine-admin-v1:current} -->
+        <version>2.1.7</version><!-- {x-version-update:proto-google-cloud-appengine-admin-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-appengine-admin/pom.xml b/google-cloud-appengine-admin/pom.xml
index 57e90196..b8f14a8a 100644
--- a/google-cloud-appengine-admin/pom.xml
+++ b/google-cloud-appengine-admin/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-appengine-admin</artifactId>
-  <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+  <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
   <packaging>jar</packaging>
   <name>Google App Engine Admin API</name>
   <url>https://github.com/googleapis/java-appengine-admin</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-appengine-admin-parent</artifactId>
-    <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+    <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-appengine-admin</site.installationModule>
diff --git a/grpc-google-cloud-appengine-admin-v1/pom.xml b/grpc-google-cloud-appengine-admin-v1/pom.xml
index b27867ee..c2a757c3 100644
--- a/grpc-google-cloud-appengine-admin-v1/pom.xml
+++ b/grpc-google-cloud-appengine-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-appengine-admin-v1</artifactId>
-  <version>2.1.6</version><!-- {x-version-update:grpc-google-cloud-appengine-admin-v1:current} -->
+  <version>2.1.7</version><!-- {x-version-update:grpc-google-cloud-appengine-admin-v1:current} -->
   <name>grpc-google-cloud-appengine-admin-v1</name>
   <description>GRPC library for google-cloud-appengine-admin</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-appengine-admin-parent</artifactId>
-    <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+    <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 418088f0..c48522ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-appengine-admin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+  <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
   <name>Google App Engine Admin API Parent</name>
   <url>https://github.com/googleapis/java-appengine-admin</url>
   <description>
@@ -60,17 +60,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-appengine-admin</artifactId>
-        <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+        <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-appengine-admin-v1</artifactId>
-        <version>2.1.6</version><!-- {x-version-update:grpc-google-cloud-appengine-admin-v1:current} -->
+        <version>2.1.7</version><!-- {x-version-update:grpc-google-cloud-appengine-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-appengine-admin-v1</artifactId>
-        <version>2.1.6</version><!-- {x-version-update:proto-google-cloud-appengine-admin-v1:current} -->
+        <version>2.1.7</version><!-- {x-version-update:proto-google-cloud-appengine-admin-v1:current} -->
       </dependency>
 
       <dependency>
diff --git a/proto-google-cloud-appengine-admin-v1/pom.xml b/proto-google-cloud-appengine-admin-v1/pom.xml
index 62d3c2cf..8cb01c88 100644
--- a/proto-google-cloud-appengine-admin-v1/pom.xml
+++ b/proto-google-cloud-appengine-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-appengine-admin-v1</artifactId>
-  <version>2.1.6</version><!-- {x-version-update:proto-google-cloud-appengine-admin-v1:current} -->
+  <version>2.1.7</version><!-- {x-version-update:proto-google-cloud-appengine-admin-v1:current} -->
   <name>proto-google-cloud-appengine-admin-v1</name>
   <description>Proto library for google-cloud-appengine-admin</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-appengine-admin-parent</artifactId>
-    <version>2.1.6</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
+    <version>2.1.7</version><!-- {x-version-update:google-cloud-appengine-admin:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AppYamlProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AppYamlProto.java
index baf79907..3839bf4b 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AppYamlProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AppYamlProto.java
@@ -82,88 +82,86 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n\"google/appengine/v1/app_yaml.proto\022\023go"
           + "ogle.appengine.v1\032\036google/protobuf/durat"
-          + "ion.proto\032\034google/api/annotations.proto\""
-          + "\340\001\n\020ApiConfigHandler\022=\n\020auth_fail_action"
-          + "\030\001 \001(\0162#.google.appengine.v1.AuthFailAct"
-          + "ion\0224\n\005login\030\002 \001(\0162%.google.appengine.v1"
-          + ".LoginRequirement\022\016\n\006script\030\003 \001(\t\022:\n\016sec"
-          + "urity_level\030\004 \001(\0162\".google.appengine.v1."
-          + "SecurityLevel\022\013\n\003url\030\005 \001(\t\"\217\002\n\014ErrorHand"
-          + "ler\022?\n\nerror_code\030\001 \001(\0162+.google.appengi"
-          + "ne.v1.ErrorHandler.ErrorCode\022\023\n\013static_f"
-          + "ile\030\002 \001(\t\022\021\n\tmime_type\030\003 \001(\t\"\225\001\n\tErrorCo"
-          + "de\022\032\n\026ERROR_CODE_UNSPECIFIED\020\000\022\026\n\022ERROR_"
-          + "CODE_DEFAULT\020\000\022\031\n\025ERROR_CODE_OVER_QUOTA\020"
-          + "\001\022\035\n\031ERROR_CODE_DOS_API_DENIAL\020\002\022\026\n\022ERRO"
-          + "R_CODE_TIMEOUT\020\003\032\002\020\001\"\315\005\n\006UrlMap\022\021\n\turl_r"
-          + "egex\030\001 \001(\t\022?\n\014static_files\030\002 \001(\0132\'.googl"
-          + "e.appengine.v1.StaticFilesHandlerH\000\0224\n\006s"
-          + "cript\030\003 \001(\0132\".google.appengine.v1.Script"
-          + "HandlerH\000\022?\n\014api_endpoint\030\004 \001(\0132\'.google"
-          + ".appengine.v1.ApiEndpointHandlerH\000\022:\n\016se"
-          + "curity_level\030\005 \001(\0162\".google.appengine.v1"
-          + ".SecurityLevel\0224\n\005login\030\006 \001(\0162%.google.a"
-          + "ppengine.v1.LoginRequirement\022=\n\020auth_fai"
-          + "l_action\030\007 \001(\0162#.google.appengine.v1.Aut"
-          + "hFailAction\022Y\n\033redirect_http_response_co"
-          + "de\030\010 \001(\01624.google.appengine.v1.UrlMap.Re"
-          + "directHttpResponseCode\"\333\001\n\030RedirectHttpR"
-          + "esponseCode\022+\n\'REDIRECT_HTTP_RESPONSE_CO"
-          + "DE_UNSPECIFIED\020\000\022#\n\037REDIRECT_HTTP_RESPON"
-          + "SE_CODE_301\020\001\022#\n\037REDIRECT_HTTP_RESPONSE_"
-          + "CODE_302\020\002\022#\n\037REDIRECT_HTTP_RESPONSE_COD"
-          + "E_303\020\003\022#\n\037REDIRECT_HTTP_RESPONSE_CODE_3"
-          + "07\020\004B\016\n\014handler_type\"\300\002\n\022StaticFilesHand"
-          + "ler\022\014\n\004path\030\001 \001(\t\022\031\n\021upload_path_regex\030\002"
-          + " \001(\t\022N\n\014http_headers\030\003 \003(\01328.google.appe"
-          + "ngine.v1.StaticFilesHandler.HttpHeadersE"
-          + "ntry\022\021\n\tmime_type\030\004 \001(\t\022-\n\nexpiration\030\005 "
-          + "\001(\0132\031.google.protobuf.Duration\022\035\n\025requir"
-          + "e_matching_file\030\006 \001(\010\022\034\n\024application_rea"
-          + "dable\030\007 \001(\010\0322\n\020HttpHeadersEntry\022\013\n\003key\030\001"
-          + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"$\n\rScriptHandler"
-          + "\022\023\n\013script_path\030\001 \001(\t\")\n\022ApiEndpointHand"
-          + "ler\022\023\n\013script_path\030\001 \001(\t\"\353\001\n\013HealthCheck"
-          + "\022\034\n\024disable_health_check\030\001 \001(\010\022\014\n\004host\030\002"
-          + " \001(\t\022\031\n\021healthy_threshold\030\003 \001(\r\022\033\n\023unhea"
-          + "lthy_threshold\030\004 \001(\r\022\031\n\021restart_threshol"
-          + "d\030\005 \001(\r\0221\n\016check_interval\030\006 \001(\0132\031.google"
-          + ".protobuf.Duration\022*\n\007timeout\030\007 \001(\0132\031.go"
-          + "ogle.protobuf.Duration\"\367\001\n\016ReadinessChec"
-          + "k\022\014\n\004path\030\001 \001(\t\022\014\n\004host\030\002 \001(\t\022\031\n\021failure"
-          + "_threshold\030\003 \001(\r\022\031\n\021success_threshold\030\004 "
-          + "\001(\r\0221\n\016check_interval\030\005 \001(\0132\031.google.pro"
-          + "tobuf.Duration\022*\n\007timeout\030\006 \001(\0132\031.google"
-          + ".protobuf.Duration\0224\n\021app_start_timeout\030"
-          + "\007 \001(\0132\031.google.protobuf.Duration\"\362\001\n\rLiv"
-          + "enessCheck\022\014\n\004path\030\001 \001(\t\022\014\n\004host\030\002 \001(\t\022\031"
-          + "\n\021failure_threshold\030\003 \001(\r\022\031\n\021success_thr"
-          + "eshold\030\004 \001(\r\0221\n\016check_interval\030\005 \001(\0132\031.g"
-          + "oogle.protobuf.Duration\022*\n\007timeout\030\006 \001(\013"
-          + "2\031.google.protobuf.Duration\0220\n\rinitial_d"
-          + "elay\030\007 \001(\0132\031.google.protobuf.Duration\"(\n"
-          + "\007Library\022\014\n\004name\030\001 \001(\t\022\017\n\007version\030\002 \001(\t*"
-          + "t\n\016AuthFailAction\022 \n\034AUTH_FAIL_ACTION_UN"
-          + "SPECIFIED\020\000\022\035\n\031AUTH_FAIL_ACTION_REDIRECT"
-          + "\020\001\022!\n\035AUTH_FAIL_ACTION_UNAUTHORIZED\020\002*b\n"
-          + "\020LoginRequirement\022\025\n\021LOGIN_UNSPECIFIED\020\000"
-          + "\022\022\n\016LOGIN_OPTIONAL\020\001\022\017\n\013LOGIN_ADMIN\020\002\022\022\n"
-          + "\016LOGIN_REQUIRED\020\003*y\n\rSecurityLevel\022\026\n\022SE"
-          + "CURE_UNSPECIFIED\020\000\022\022\n\016SECURE_DEFAULT\020\000\022\020"
-          + "\n\014SECURE_NEVER\020\001\022\023\n\017SECURE_OPTIONAL\020\002\022\021\n"
-          + "\rSECURE_ALWAYS\020\003\032\002\020\001B\276\001\n\027com.google.appe"
-          + "ngine.v1B\014AppYamlProtoP\001Z<google.golang."
-          + "org/genproto/googleapis/appengine/v1;app"
-          + "engine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Goo"
-          + "gle\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::"
-          + "AppEngine::V1b\006proto3"
+          + "ion.proto\"\340\001\n\020ApiConfigHandler\022=\n\020auth_f"
+          + "ail_action\030\001 \001(\0162#.google.appengine.v1.A"
+          + "uthFailAction\0224\n\005login\030\002 \001(\0162%.google.ap"
+          + "pengine.v1.LoginRequirement\022\016\n\006script\030\003 "
+          + "\001(\t\022:\n\016security_level\030\004 \001(\0162\".google.app"
+          + "engine.v1.SecurityLevel\022\013\n\003url\030\005 \001(\t\"\217\002\n"
+          + "\014ErrorHandler\022?\n\nerror_code\030\001 \001(\0162+.goog"
+          + "le.appengine.v1.ErrorHandler.ErrorCode\022\023"
+          + "\n\013static_file\030\002 \001(\t\022\021\n\tmime_type\030\003 \001(\t\"\225"
+          + "\001\n\tErrorCode\022\032\n\026ERROR_CODE_UNSPECIFIED\020\000"
+          + "\022\026\n\022ERROR_CODE_DEFAULT\020\000\022\031\n\025ERROR_CODE_O"
+          + "VER_QUOTA\020\001\022\035\n\031ERROR_CODE_DOS_API_DENIAL"
+          + "\020\002\022\026\n\022ERROR_CODE_TIMEOUT\020\003\032\002\020\001\"\315\005\n\006UrlMa"
+          + "p\022\021\n\turl_regex\030\001 \001(\t\022?\n\014static_files\030\002 \001"
+          + "(\0132\'.google.appengine.v1.StaticFilesHand"
+          + "lerH\000\0224\n\006script\030\003 \001(\0132\".google.appengine"
+          + ".v1.ScriptHandlerH\000\022?\n\014api_endpoint\030\004 \001("
+          + "\0132\'.google.appengine.v1.ApiEndpointHandl"
+          + "erH\000\022:\n\016security_level\030\005 \001(\0162\".google.ap"
+          + "pengine.v1.SecurityLevel\0224\n\005login\030\006 \001(\0162"
+          + "%.google.appengine.v1.LoginRequirement\022="
+          + "\n\020auth_fail_action\030\007 \001(\0162#.google.appeng"
+          + "ine.v1.AuthFailAction\022Y\n\033redirect_http_r"
+          + "esponse_code\030\010 \001(\01624.google.appengine.v1"
+          + ".UrlMap.RedirectHttpResponseCode\"\333\001\n\030Red"
+          + "irectHttpResponseCode\022+\n\'REDIRECT_HTTP_R"
+          + "ESPONSE_CODE_UNSPECIFIED\020\000\022#\n\037REDIRECT_H"
+          + "TTP_RESPONSE_CODE_301\020\001\022#\n\037REDIRECT_HTTP"
+          + "_RESPONSE_CODE_302\020\002\022#\n\037REDIRECT_HTTP_RE"
+          + "SPONSE_CODE_303\020\003\022#\n\037REDIRECT_HTTP_RESPO"
+          + "NSE_CODE_307\020\004B\016\n\014handler_type\"\300\002\n\022Stati"
+          + "cFilesHandler\022\014\n\004path\030\001 \001(\t\022\031\n\021upload_pa"
+          + "th_regex\030\002 \001(\t\022N\n\014http_headers\030\003 \003(\01328.g"
+          + "oogle.appengine.v1.StaticFilesHandler.Ht"
+          + "tpHeadersEntry\022\021\n\tmime_type\030\004 \001(\t\022-\n\nexp"
+          + "iration\030\005 \001(\0132\031.google.protobuf.Duration"
+          + "\022\035\n\025require_matching_file\030\006 \001(\010\022\034\n\024appli"
+          + "cation_readable\030\007 \001(\010\0322\n\020HttpHeadersEntr"
+          + "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"$\n\rScr"
+          + "iptHandler\022\023\n\013script_path\030\001 \001(\t\")\n\022ApiEn"
+          + "dpointHandler\022\023\n\013script_path\030\001 \001(\t\"\353\001\n\013H"
+          + "ealthCheck\022\034\n\024disable_health_check\030\001 \001(\010"
+          + "\022\014\n\004host\030\002 \001(\t\022\031\n\021healthy_threshold\030\003 \001("
+          + "\r\022\033\n\023unhealthy_threshold\030\004 \001(\r\022\031\n\021restar"
+          + "t_threshold\030\005 \001(\r\0221\n\016check_interval\030\006 \001("
+          + "\0132\031.google.protobuf.Duration\022*\n\007timeout\030"
+          + "\007 \001(\0132\031.google.protobuf.Duration\"\367\001\n\016Rea"
+          + "dinessCheck\022\014\n\004path\030\001 \001(\t\022\014\n\004host\030\002 \001(\t\022"
+          + "\031\n\021failure_threshold\030\003 \001(\r\022\031\n\021success_th"
+          + "reshold\030\004 \001(\r\0221\n\016check_interval\030\005 \001(\0132\031."
+          + "google.protobuf.Duration\022*\n\007timeout\030\006 \001("
+          + "\0132\031.google.protobuf.Duration\0224\n\021app_star"
+          + "t_timeout\030\007 \001(\0132\031.google.protobuf.Durati"
+          + "on\"\362\001\n\rLivenessCheck\022\014\n\004path\030\001 \001(\t\022\014\n\004ho"
+          + "st\030\002 \001(\t\022\031\n\021failure_threshold\030\003 \001(\r\022\031\n\021s"
+          + "uccess_threshold\030\004 \001(\r\0221\n\016check_interval"
+          + "\030\005 \001(\0132\031.google.protobuf.Duration\022*\n\007tim"
+          + "eout\030\006 \001(\0132\031.google.protobuf.Duration\0220\n"
+          + "\rinitial_delay\030\007 \001(\0132\031.google.protobuf.D"
+          + "uration\"(\n\007Library\022\014\n\004name\030\001 \001(\t\022\017\n\007vers"
+          + "ion\030\002 \001(\t*t\n\016AuthFailAction\022 \n\034AUTH_FAIL"
+          + "_ACTION_UNSPECIFIED\020\000\022\035\n\031AUTH_FAIL_ACTIO"
+          + "N_REDIRECT\020\001\022!\n\035AUTH_FAIL_ACTION_UNAUTHO"
+          + "RIZED\020\002*b\n\020LoginRequirement\022\025\n\021LOGIN_UNS"
+          + "PECIFIED\020\000\022\022\n\016LOGIN_OPTIONAL\020\001\022\017\n\013LOGIN_"
+          + "ADMIN\020\002\022\022\n\016LOGIN_REQUIRED\020\003*y\n\rSecurityL"
+          + "evel\022\026\n\022SECURE_UNSPECIFIED\020\000\022\022\n\016SECURE_D"
+          + "EFAULT\020\000\022\020\n\014SECURE_NEVER\020\001\022\023\n\017SECURE_OPT"
+          + "IONAL\020\002\022\021\n\rSECURE_ALWAYS\020\003\032\002\020\001B\276\001\n\027com.g"
+          + "oogle.appengine.v1B\014AppYamlProtoP\001Z<goog"
+          + "le.golang.org/genproto/googleapis/appeng"
+          + "ine/v1;appengine\252\002\031Google.Cloud.AppEngin"
+          + "e.V1\312\002\031Google\\Cloud\\AppEngine\\V1\352\002\034Googl"
+          + "e::Cloud::AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.DurationProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_ApiConfigHandler_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -286,7 +284,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name", "Version",
             });
     com.google.protobuf.DurationProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ApplicationProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ApplicationProto.java
index 6655a15e..5c9a338e 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ApplicationProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ApplicationProto.java
@@ -54,47 +54,45 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n%google/appengine/v1/application.proto\022"
           + "\023google.appengine.v1\032\036google/protobuf/du"
-          + "ration.proto\032\034google/api/annotations.pro"
-          + "to\"\360\007\n\013Application\022\014\n\004name\030\001 \001(\t\022\n\n\002id\030\002"
-          + " \001(\t\022<\n\016dispatch_rules\030\003 \003(\0132$.google.ap"
-          + "pengine.v1.UrlDispatchRule\022\023\n\013auth_domai"
-          + "n\030\006 \001(\t\022\023\n\013location_id\030\007 \001(\t\022\023\n\013code_buc"
-          + "ket\030\010 \001(\t\022<\n\031default_cookie_expiration\030\t"
-          + " \001(\0132\031.google.protobuf.Duration\022F\n\016servi"
-          + "ng_status\030\n \001(\0162..google.appengine.v1.Ap"
-          + "plication.ServingStatus\022\030\n\020default_hostn"
-          + "ame\030\013 \001(\t\022\026\n\016default_bucket\030\014 \001(\t\022@\n\003iap"
-          + "\030\016 \001(\01323.google.appengine.v1.Application"
-          + ".IdentityAwareProxy\022\022\n\ngcr_domain\030\020 \001(\t\022"
-          + "D\n\rdatabase_type\030\021 \001(\0162-.google.appengin"
-          + "e.v1.Application.DatabaseType\022J\n\020feature"
-          + "_settings\030\022 \001(\01320.google.appengine.v1.Ap"
-          + "plication.FeatureSettings\032\202\001\n\022IdentityAw"
-          + "areProxy\022\017\n\007enabled\030\001 \001(\010\022\030\n\020oauth2_clie"
-          + "nt_id\030\002 \001(\t\022\034\n\024oauth2_client_secret\030\003 \001("
-          + "\t\022#\n\033oauth2_client_secret_sha256\030\004 \001(\t\032R"
-          + "\n\017FeatureSettings\022\033\n\023split_health_checks"
-          + "\030\001 \001(\010\022\"\n\032use_container_optimized_os\030\002 \001"
-          + "(\010\"U\n\rServingStatus\022\017\n\013UNSPECIFIED\020\000\022\013\n\007"
-          + "SERVING\020\001\022\021\n\rUSER_DISABLED\020\002\022\023\n\017SYSTEM_D"
-          + "ISABLED\020\003\"z\n\014DatabaseType\022\035\n\031DATABASE_TY"
-          + "PE_UNSPECIFIED\020\000\022\023\n\017CLOUD_DATASTORE\020\001\022\023\n"
-          + "\017CLOUD_FIRESTORE\020\002\022!\n\035CLOUD_DATASTORE_CO"
-          + "MPATIBILITY\020\003\"@\n\017UrlDispatchRule\022\016\n\006doma"
-          + "in\030\001 \001(\t\022\014\n\004path\030\002 \001(\t\022\017\n\007service\030\003 \001(\tB"
-          + "\302\001\n\027com.google.appengine.v1B\020Application"
-          + "ProtoP\001Z<google.golang.org/genproto/goog"
-          + "leapis/appengine/v1;appengine\252\002\031Google.C"
-          + "loud.AppEngine.V1\312\002\031Google\\Cloud\\AppEngi"
-          + "ne\\V1\352\002\034Google::Cloud::AppEngine::V1b\006pr"
-          + "oto3"
+          + "ration.proto\"\360\007\n\013Application\022\014\n\004name\030\001 \001"
+          + "(\t\022\n\n\002id\030\002 \001(\t\022<\n\016dispatch_rules\030\003 \003(\0132$"
+          + ".google.appengine.v1.UrlDispatchRule\022\023\n\013"
+          + "auth_domain\030\006 \001(\t\022\023\n\013location_id\030\007 \001(\t\022\023"
+          + "\n\013code_bucket\030\010 \001(\t\022<\n\031default_cookie_ex"
+          + "piration\030\t \001(\0132\031.google.protobuf.Duratio"
+          + "n\022F\n\016serving_status\030\n \001(\0162..google.appen"
+          + "gine.v1.Application.ServingStatus\022\030\n\020def"
+          + "ault_hostname\030\013 \001(\t\022\026\n\016default_bucket\030\014 "
+          + "\001(\t\022@\n\003iap\030\016 \001(\01323.google.appengine.v1.A"
+          + "pplication.IdentityAwareProxy\022\022\n\ngcr_dom"
+          + "ain\030\020 \001(\t\022D\n\rdatabase_type\030\021 \001(\0162-.googl"
+          + "e.appengine.v1.Application.DatabaseType\022"
+          + "J\n\020feature_settings\030\022 \001(\01320.google.appen"
+          + "gine.v1.Application.FeatureSettings\032\202\001\n\022"
+          + "IdentityAwareProxy\022\017\n\007enabled\030\001 \001(\010\022\030\n\020o"
+          + "auth2_client_id\030\002 \001(\t\022\034\n\024oauth2_client_s"
+          + "ecret\030\003 \001(\t\022#\n\033oauth2_client_secret_sha2"
+          + "56\030\004 \001(\t\032R\n\017FeatureSettings\022\033\n\023split_hea"
+          + "lth_checks\030\001 \001(\010\022\"\n\032use_container_optimi"
+          + "zed_os\030\002 \001(\010\"U\n\rServingStatus\022\017\n\013UNSPECI"
+          + "FIED\020\000\022\013\n\007SERVING\020\001\022\021\n\rUSER_DISABLED\020\002\022\023"
+          + "\n\017SYSTEM_DISABLED\020\003\"z\n\014DatabaseType\022\035\n\031D"
+          + "ATABASE_TYPE_UNSPECIFIED\020\000\022\023\n\017CLOUD_DATA"
+          + "STORE\020\001\022\023\n\017CLOUD_FIRESTORE\020\002\022!\n\035CLOUD_DA"
+          + "TASTORE_COMPATIBILITY\020\003\"@\n\017UrlDispatchRu"
+          + "le\022\016\n\006domain\030\001 \001(\t\022\014\n\004path\030\002 \001(\t\022\017\n\007serv"
+          + "ice\030\003 \001(\tB\302\001\n\027com.google.appengine.v1B\020A"
+          + "pplicationProtoP\001Z<google.golang.org/gen"
+          + "proto/googleapis/appengine/v1;appengine\252"
+          + "\002\031Google.Cloud.AppEngine.V1\312\002\031Google\\Clo"
+          + "ud\\AppEngine\\V1\352\002\034Google::Cloud::AppEngi"
+          + "ne::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.DurationProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_Application_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -142,7 +140,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Domain", "Path", "Service",
             });
     com.google.protobuf.DurationProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AuditDataProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AuditDataProto.java
index 070dff72..887c508e 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AuditDataProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/AuditDataProto.java
@@ -50,28 +50,26 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n$google/appengine/v1/audit_data.proto\022\023"
           + "google.appengine.v1\032#google/appengine/v1"
-          + "/appengine.proto\032\034google/api/annotations"
-          + ".proto\"\235\001\n\tAuditData\022B\n\016update_service\030\001"
-          + " \001(\0132(.google.appengine.v1.UpdateService"
-          + "MethodH\000\022B\n\016create_version\030\002 \001(\0132(.googl"
-          + "e.appengine.v1.CreateVersionMethodH\000B\010\n\006"
-          + "method\"Q\n\023UpdateServiceMethod\022:\n\007request"
-          + "\030\001 \001(\0132).google.appengine.v1.UpdateServi"
-          + "ceRequest\"Q\n\023CreateVersionMethod\022:\n\007requ"
-          + "est\030\001 \001(\0132).google.appengine.v1.CreateVe"
-          + "rsionRequestB\300\001\n\027com.google.appengine.v1"
-          + "B\016AuditDataProtoP\001Z<google.golang.org/ge"
-          + "nproto/googleapis/appengine/v1;appengine"
-          + "\252\002\031Google.Cloud.AppEngine.V1\312\002\031Google\\Cl"
-          + "oud\\AppEngine\\V1\352\002\034Google::Cloud::AppEng"
-          + "ine::V1b\006proto3"
+          + "/appengine.proto\"\235\001\n\tAuditData\022B\n\016update"
+          + "_service\030\001 \001(\0132(.google.appengine.v1.Upd"
+          + "ateServiceMethodH\000\022B\n\016create_version\030\002 \001"
+          + "(\0132(.google.appengine.v1.CreateVersionMe"
+          + "thodH\000B\010\n\006method\"Q\n\023UpdateServiceMethod\022"
+          + ":\n\007request\030\001 \001(\0132).google.appengine.v1.U"
+          + "pdateServiceRequest\"Q\n\023CreateVersionMeth"
+          + "od\022:\n\007request\030\001 \001(\0132).google.appengine.v"
+          + "1.CreateVersionRequestB\300\001\n\027com.google.ap"
+          + "pengine.v1B\016AuditDataProtoP\001Z<google.gol"
+          + "ang.org/genproto/googleapis/appengine/v1"
+          + ";appengine\252\002\031Google.Cloud.AppEngine.V1\312\002"
+          + "\031Google\\Cloud\\AppEngine\\V1\352\002\034Google::Clo"
+          + "ud::AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.appengine.v1.AppengineProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_AuditData_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -98,7 +96,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Request",
             });
     com.google.appengine.v1.AppengineProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/CertificateProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/CertificateProto.java
index f00b1742..5445ed51 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/CertificateProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/CertificateProto.java
@@ -50,39 +50,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n%google/appengine/v1/certificate.proto\022"
           + "\023google.appengine.v1\032\037google/protobuf/ti"
-          + "mestamp.proto\032\034google/api/annotations.pr"
-          + "oto\"\333\002\n\025AuthorizedCertificate\022\014\n\004name\030\001 "
-          + "\001(\t\022\n\n\002id\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\024\n"
-          + "\014domain_names\030\004 \003(\t\022/\n\013expire_time\030\005 \001(\013"
-          + "2\032.google.protobuf.Timestamp\022E\n\024certific"
-          + "ate_raw_data\030\006 \001(\0132\'.google.appengine.v1"
-          + ".CertificateRawData\022D\n\023managed_certifica"
-          + "te\030\007 \001(\0132\'.google.appengine.v1.ManagedCe"
-          + "rtificate\022\037\n\027visible_domain_mappings\030\010 \003"
-          + "(\t\022\035\n\025domain_mappings_count\030\t \001(\005\"E\n\022Cer"
-          + "tificateRawData\022\032\n\022public_certificate\030\001 "
-          + "\001(\t\022\023\n\013private_key\030\002 \001(\t\"\202\001\n\022ManagedCert"
-          + "ificate\0225\n\021last_renewal_time\030\001 \001(\0132\032.goo"
-          + "gle.protobuf.Timestamp\0225\n\006status\030\002 \001(\0162%"
-          + ".google.appengine.v1.ManagementStatus*\306\001"
-          + "\n\020ManagementStatus\022!\n\035MANAGEMENT_STATUS_"
-          + "UNSPECIFIED\020\000\022\006\n\002OK\020\001\022\013\n\007PENDING\020\002\022\037\n\033FA"
-          + "ILED_RETRYING_NOT_VISIBLE\020\004\022\024\n\020FAILED_PE"
-          + "RMANENT\020\006\022!\n\035FAILED_RETRYING_CAA_FORBIDD"
-          + "EN\020\007\022 \n\034FAILED_RETRYING_CAA_CHECKING\020\010B\302"
-          + "\001\n\027com.google.appengine.v1B\020CertificateP"
-          + "rotoP\001Z<google.golang.org/genproto/googl"
-          + "eapis/appengine/v1;appengine\252\002\031Google.Cl"
-          + "oud.AppEngine.V1\312\002\031Google\\Cloud\\AppEngin"
-          + "e\\V1\352\002\034Google::Cloud::AppEngine::V1b\006pro"
-          + "to3"
+          + "mestamp.proto\"\333\002\n\025AuthorizedCertificate\022"
+          + "\014\n\004name\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\022\024\n\014display_nam"
+          + "e\030\003 \001(\t\022\024\n\014domain_names\030\004 \003(\t\022/\n\013expire_"
+          + "time\030\005 \001(\0132\032.google.protobuf.Timestamp\022E"
+          + "\n\024certificate_raw_data\030\006 \001(\0132\'.google.ap"
+          + "pengine.v1.CertificateRawData\022D\n\023managed"
+          + "_certificate\030\007 \001(\0132\'.google.appengine.v1"
+          + ".ManagedCertificate\022\037\n\027visible_domain_ma"
+          + "ppings\030\010 \003(\t\022\035\n\025domain_mappings_count\030\t "
+          + "\001(\005\"E\n\022CertificateRawData\022\032\n\022public_cert"
+          + "ificate\030\001 \001(\t\022\023\n\013private_key\030\002 \001(\t\"\202\001\n\022M"
+          + "anagedCertificate\0225\n\021last_renewal_time\030\001"
+          + " \001(\0132\032.google.protobuf.Timestamp\0225\n\006stat"
+          + "us\030\002 \001(\0162%.google.appengine.v1.Managemen"
+          + "tStatus*\306\001\n\020ManagementStatus\022!\n\035MANAGEME"
+          + "NT_STATUS_UNSPECIFIED\020\000\022\006\n\002OK\020\001\022\013\n\007PENDI"
+          + "NG\020\002\022\037\n\033FAILED_RETRYING_NOT_VISIBLE\020\004\022\024\n"
+          + "\020FAILED_PERMANENT\020\006\022!\n\035FAILED_RETRYING_C"
+          + "AA_FORBIDDEN\020\007\022 \n\034FAILED_RETRYING_CAA_CH"
+          + "ECKING\020\010B\302\001\n\027com.google.appengine.v1B\020Ce"
+          + "rtificateProtoP\001Z<google.golang.org/genp"
+          + "roto/googleapis/appengine/v1;appengine\252\002"
+          + "\031Google.Cloud.AppEngine.V1\312\002\031Google\\Clou"
+          + "d\\AppEngine\\V1\352\002\034Google::Cloud::AppEngin"
+          + "e::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.TimestampProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_AuthorizedCertificate_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -117,7 +115,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "LastRenewalTime", "Status",
             });
     com.google.protobuf.TimestampProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployProto.java
index cb67ef41..e9469ab4 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployProto.java
@@ -62,34 +62,32 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n google/appengine/v1/deploy.proto\022\023goog"
           + "le.appengine.v1\032\036google/protobuf/duratio"
-          + "n.proto\032\034google/api/annotations.proto\"\273\002"
-          + "\n\nDeployment\0229\n\005files\030\001 \003(\0132*.google.app"
-          + "engine.v1.Deployment.FilesEntry\0225\n\tconta"
-          + "iner\030\002 \001(\0132\".google.appengine.v1.Contain"
-          + "erInfo\022)\n\003zip\030\003 \001(\0132\034.google.appengine.v"
-          + "1.ZipInfo\022C\n\023cloud_build_options\030\006 \001(\0132&"
-          + ".google.appengine.v1.CloudBuildOptions\032K"
-          + "\n\nFilesEntry\022\013\n\003key\030\001 \001(\t\022,\n\005value\030\002 \001(\013"
-          + "2\035.google.appengine.v1.FileInfo:\0028\001\"C\n\010F"
-          + "ileInfo\022\022\n\nsource_url\030\001 \001(\t\022\020\n\010sha1_sum\030"
-          + "\002 \001(\t\022\021\n\tmime_type\030\003 \001(\t\"\036\n\rContainerInf"
-          + "o\022\r\n\005image\030\001 \001(\t\"b\n\021CloudBuildOptions\022\025\n"
-          + "\rapp_yaml_path\030\001 \001(\t\0226\n\023cloud_build_time"
-          + "out\030\002 \001(\0132\031.google.protobuf.Duration\"2\n\007"
-          + "ZipInfo\022\022\n\nsource_url\030\003 \001(\t\022\023\n\013files_cou"
-          + "nt\030\004 \001(\005B\275\001\n\027com.google.appengine.v1B\013De"
-          + "ployProtoP\001Z<google.golang.org/genproto/"
-          + "googleapis/appengine/v1;appengine\252\002\031Goog"
-          + "le.Cloud.AppEngine.V1\312\002\031Google\\Cloud\\App"
-          + "Engine\\V1\352\002\034Google::Cloud::AppEngine::V1"
-          + "b\006proto3"
+          + "n.proto\"\273\002\n\nDeployment\0229\n\005files\030\001 \003(\0132*."
+          + "google.appengine.v1.Deployment.FilesEntr"
+          + "y\0225\n\tcontainer\030\002 \001(\0132\".google.appengine."
+          + "v1.ContainerInfo\022)\n\003zip\030\003 \001(\0132\034.google.a"
+          + "ppengine.v1.ZipInfo\022C\n\023cloud_build_optio"
+          + "ns\030\006 \001(\0132&.google.appengine.v1.CloudBuil"
+          + "dOptions\032K\n\nFilesEntry\022\013\n\003key\030\001 \001(\t\022,\n\005v"
+          + "alue\030\002 \001(\0132\035.google.appengine.v1.FileInf"
+          + "o:\0028\001\"C\n\010FileInfo\022\022\n\nsource_url\030\001 \001(\t\022\020\n"
+          + "\010sha1_sum\030\002 \001(\t\022\021\n\tmime_type\030\003 \001(\t\"\036\n\rCo"
+          + "ntainerInfo\022\r\n\005image\030\001 \001(\t\"b\n\021CloudBuild"
+          + "Options\022\025\n\rapp_yaml_path\030\001 \001(\t\0226\n\023cloud_"
+          + "build_timeout\030\002 \001(\0132\031.google.protobuf.Du"
+          + "ration\"2\n\007ZipInfo\022\022\n\nsource_url\030\003 \001(\t\022\023\n"
+          + "\013files_count\030\004 \001(\005B\275\001\n\027com.google.appeng"
+          + "ine.v1B\013DeployProtoP\001Z<google.golang.org"
+          + "/genproto/googleapis/appengine/v1;appeng"
+          + "ine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Google"
+          + "\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::App"
+          + "Engine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.DurationProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_Deployment_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -140,7 +138,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "SourceUrl", "FilesCount",
             });
     com.google.protobuf.DurationProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployedFilesProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployedFilesProto.java
index 2695d0c1..a9c4820a 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployedFilesProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DeployedFilesProto.java
@@ -36,21 +36,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n(google/appengine/v1/deployed_files.pro"
-          + "to\022\023google.appengine.v1\032\034google/api/anno"
-          + "tations.protoB\304\001\n\027com.google.appengine.v"
-          + "1B\022DeployedFilesProtoP\001Z<google.golang.o"
-          + "rg/genproto/googleapis/appengine/v1;appe"
-          + "ngine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Goog"
-          + "le\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::A"
-          + "ppEngine::V1b\006proto3"
+          + "to\022\023google.appengine.v1B\304\001\n\027com.google.a"
+          + "ppengine.v1B\022DeployedFilesProtoP\001Z<googl"
+          + "e.golang.org/genproto/googleapis/appengi"
+          + "ne/v1;appengine\252\002\031Google.Cloud.AppEngine"
+          + ".V1\312\002\031Google\\Cloud\\AppEngine\\V1\352\002\034Google"
+          + "::Cloud::AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.AnnotationsProto.getDescriptor(),
-            });
-    com.google.api.AnnotationsProto.getDescriptor();
+            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainMappingProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainMappingProto.java
index 239908d7..06ef8310 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainMappingProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainMappingProto.java
@@ -49,35 +49,31 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n(google/appengine/v1/domain_mapping.pro"
-          + "to\022\023google.appengine.v1\032\034google/api/anno"
-          + "tations.proto\"\240\001\n\rDomainMapping\022\014\n\004name\030"
-          + "\001 \001(\t\022\n\n\002id\030\002 \001(\t\0226\n\014ssl_settings\030\003 \001(\0132"
-          + " .google.appengine.v1.SslSettings\022=\n\020res"
-          + "ource_records\030\004 \003(\0132#.google.appengine.v"
-          + "1.ResourceRecord\"\363\001\n\013SslSettings\022\026\n\016cert"
-          + "ificate_id\030\001 \001(\t\022O\n\023ssl_management_type\030"
-          + "\003 \001(\01622.google.appengine.v1.SslSettings."
-          + "SslManagementType\022&\n\036pending_managed_cer"
-          + "tificate_id\030\004 \001(\t\"S\n\021SslManagementType\022#"
-          + "\n\037SSL_MANAGEMENT_TYPE_UNSPECIFIED\020\000\022\r\n\tA"
-          + "UTOMATIC\020\001\022\n\n\006MANUAL\020\002\"\263\001\n\016ResourceRecor"
-          + "d\022\014\n\004name\030\001 \001(\t\022\016\n\006rrdata\030\002 \001(\t\022<\n\004type\030"
-          + "\003 \001(\0162..google.appengine.v1.ResourceReco"
-          + "rd.RecordType\"E\n\nRecordType\022\033\n\027RECORD_TY"
-          + "PE_UNSPECIFIED\020\000\022\005\n\001A\020\001\022\010\n\004AAAA\020\002\022\t\n\005CNA"
-          + "ME\020\003B\304\001\n\027com.google.appengine.v1B\022Domain"
-          + "MappingProtoP\001Z<google.golang.org/genpro"
-          + "to/googleapis/appengine/v1;appengine\252\002\031G"
-          + "oogle.Cloud.AppEngine.V1\312\002\031Google\\Cloud\\"
-          + "AppEngine\\V1\352\002\034Google::Cloud::AppEngine:"
-          + ":V1b\006proto3"
+          + "to\022\023google.appengine.v1\"\240\001\n\rDomainMappin"
+          + "g\022\014\n\004name\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\0226\n\014ssl_setti"
+          + "ngs\030\003 \001(\0132 .google.appengine.v1.SslSetti"
+          + "ngs\022=\n\020resource_records\030\004 \003(\0132#.google.a"
+          + "ppengine.v1.ResourceRecord\"\363\001\n\013SslSettin"
+          + "gs\022\026\n\016certificate_id\030\001 \001(\t\022O\n\023ssl_manage"
+          + "ment_type\030\003 \001(\01622.google.appengine.v1.Ss"
+          + "lSettings.SslManagementType\022&\n\036pending_m"
+          + "anaged_certificate_id\030\004 \001(\t\"S\n\021SslManage"
+          + "mentType\022#\n\037SSL_MANAGEMENT_TYPE_UNSPECIF"
+          + "IED\020\000\022\r\n\tAUTOMATIC\020\001\022\n\n\006MANUAL\020\002\"\263\001\n\016Res"
+          + "ourceRecord\022\014\n\004name\030\001 \001(\t\022\016\n\006rrdata\030\002 \001("
+          + "\t\022<\n\004type\030\003 \001(\0162..google.appengine.v1.Re"
+          + "sourceRecord.RecordType\"E\n\nRecordType\022\033\n"
+          + "\027RECORD_TYPE_UNSPECIFIED\020\000\022\005\n\001A\020\001\022\010\n\004AAA"
+          + "A\020\002\022\t\n\005CNAME\020\003B\304\001\n\027com.google.appengine."
+          + "v1B\022DomainMappingProtoP\001Z<google.golang."
+          + "org/genproto/googleapis/appengine/v1;app"
+          + "engine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Goo"
+          + "gle\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::"
+          + "AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.AnnotationsProto.getDescriptor(),
-            });
+            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
     internal_static_google_appengine_v1_DomainMapping_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_appengine_v1_DomainMapping_fieldAccessorTable =
@@ -102,7 +98,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Name", "Rrdata", "Type",
             });
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainProto.java
index ce651166..ee8095b1 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/DomainProto.java
@@ -41,21 +41,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n google/appengine/v1/domain.proto\022\023goog"
-          + "le.appengine.v1\032\034google/api/annotations."
-          + "proto\",\n\020AuthorizedDomain\022\014\n\004name\030\001 \001(\t\022"
-          + "\n\n\002id\030\002 \001(\tB\275\001\n\027com.google.appengine.v1B"
-          + "\013DomainProtoP\001Z<google.golang.org/genpro"
-          + "to/googleapis/appengine/v1;appengine\252\002\031G"
-          + "oogle.Cloud.AppEngine.V1\312\002\031Google\\Cloud\\"
-          + "AppEngine\\V1\352\002\034Google::Cloud::AppEngine:"
-          + ":V1b\006proto3"
+          + "le.appengine.v1\",\n\020AuthorizedDomain\022\014\n\004n"
+          + "ame\030\001 \001(\t\022\n\n\002id\030\002 \001(\tB\275\001\n\027com.google.app"
+          + "engine.v1B\013DomainProtoP\001Z<google.golang."
+          + "org/genproto/googleapis/appengine/v1;app"
+          + "engine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Goo"
+          + "gle\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::"
+          + "AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.AnnotationsProto.getDescriptor(),
-            });
+            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
     internal_static_google_appengine_v1_AuthorizedDomain_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_appengine_v1_AuthorizedDomain_fieldAccessorTable =
@@ -64,7 +60,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Name", "Id",
             });
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceProto.java
index 16cb58c1..edb5ea62 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceProto.java
@@ -47,34 +47,34 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
       "\n\"google/appengine/v1/instance.proto\022\023go"
           + "ogle.appengine.v1\032\037google/api/field_beha"
           + "vior.proto\032\031google/api/resource.proto\032\037g"
-          + "oogle/protobuf/timestamp.proto\032\034google/a"
-          + "pi/annotations.proto\"\316\006\n\010Instance\022\021\n\004nam"
-          + "e\030\001 \001(\tB\003\340A\003\022\017\n\002id\030\002 \001(\tB\003\340A\003\022\037\n\022app_eng"
-          + "ine_release\030\003 \001(\tB\003\340A\003\022E\n\014availability\030\004"
-          + " \001(\0162*.google.appengine.v1.Instance.Avai"
-          + "labilityB\003\340A\003\022\024\n\007vm_name\030\005 \001(\tB\003\340A\003\022\031\n\014v"
-          + "m_zone_name\030\006 \001(\tB\003\340A\003\022\022\n\005vm_id\030\007 \001(\tB\003\340"
-          + "A\003\0223\n\nstart_time\030\010 \001(\0132\032.google.protobuf"
-          + ".TimestampB\003\340A\003\022\025\n\010requests\030\t \001(\005B\003\340A\003\022\023"
-          + "\n\006errors\030\n \001(\005B\003\340A\003\022\020\n\003qps\030\013 \001(\002B\003\340A\003\022\034\n"
-          + "\017average_latency\030\014 \001(\005B\003\340A\003\022\031\n\014memory_us"
-          + "age\030\r \001(\003B\003\340A\003\022\026\n\tvm_status\030\016 \001(\tB\003\340A\003\022\035"
-          + "\n\020vm_debug_enabled\030\017 \001(\010B\003\340A\003\022\022\n\005vm_ip\030\020"
-          + " \001(\tB\003\340A\003\022N\n\013vm_liveness\030\021 \001(\01624.google."
-          + "appengine.v1.Instance.Liveness.LivenessS"
-          + "tateB\003\340A\003\032\177\n\010Liveness\"s\n\rLivenessState\022\036"
-          + "\n\032LIVENESS_STATE_UNSPECIFIED\020\000\022\013\n\007UNKNOW"
-          + "N\020\001\022\013\n\007HEALTHY\020\002\022\r\n\tUNHEALTHY\020\003\022\014\n\010DRAIN"
-          + "ING\020\004\022\013\n\007TIMEOUT\020\005\":\n\014Availability\022\017\n\013UN"
-          + "SPECIFIED\020\000\022\014\n\010RESIDENT\020\001\022\013\n\007DYNAMIC\020\002:m"
-          + "\352Aj\n!appengine.googleapis.com/Instance\022E"
-          + "apps/{app}/services/{service}/versions/{"
-          + "version}/instances/{instance}B\277\001\n\027com.go"
-          + "ogle.appengine.v1B\rInstanceProtoP\001Z<goog"
-          + "le.golang.org/genproto/googleapis/appeng"
-          + "ine/v1;appengine\252\002\031Google.Cloud.AppEngin"
-          + "e.V1\312\002\031Google\\Cloud\\AppEngine\\V1\352\002\034Googl"
-          + "e::Cloud::AppEngine::V1b\006proto3"
+          + "oogle/protobuf/timestamp.proto\"\316\006\n\010Insta"
+          + "nce\022\021\n\004name\030\001 \001(\tB\003\340A\003\022\017\n\002id\030\002 \001(\tB\003\340A\003\022"
+          + "\037\n\022app_engine_release\030\003 \001(\tB\003\340A\003\022E\n\014avai"
+          + "lability\030\004 \001(\0162*.google.appengine.v1.Ins"
+          + "tance.AvailabilityB\003\340A\003\022\024\n\007vm_name\030\005 \001(\t"
+          + "B\003\340A\003\022\031\n\014vm_zone_name\030\006 \001(\tB\003\340A\003\022\022\n\005vm_i"
+          + "d\030\007 \001(\tB\003\340A\003\0223\n\nstart_time\030\010 \001(\0132\032.googl"
+          + "e.protobuf.TimestampB\003\340A\003\022\025\n\010requests\030\t "
+          + "\001(\005B\003\340A\003\022\023\n\006errors\030\n \001(\005B\003\340A\003\022\020\n\003qps\030\013 \001"
+          + "(\002B\003\340A\003\022\034\n\017average_latency\030\014 \001(\005B\003\340A\003\022\031\n"
+          + "\014memory_usage\030\r \001(\003B\003\340A\003\022\026\n\tvm_status\030\016 "
+          + "\001(\tB\003\340A\003\022\035\n\020vm_debug_enabled\030\017 \001(\010B\003\340A\003\022"
+          + "\022\n\005vm_ip\030\020 \001(\tB\003\340A\003\022N\n\013vm_liveness\030\021 \001(\016"
+          + "24.google.appengine.v1.Instance.Liveness"
+          + ".LivenessStateB\003\340A\003\032\177\n\010Liveness\"s\n\rLiven"
+          + "essState\022\036\n\032LIVENESS_STATE_UNSPECIFIED\020\000"
+          + "\022\013\n\007UNKNOWN\020\001\022\013\n\007HEALTHY\020\002\022\r\n\tUNHEALTHY\020"
+          + "\003\022\014\n\010DRAINING\020\004\022\013\n\007TIMEOUT\020\005\":\n\014Availabi"
+          + "lity\022\017\n\013UNSPECIFIED\020\000\022\014\n\010RESIDENT\020\001\022\013\n\007D"
+          + "YNAMIC\020\002:m\352Aj\n!appengine.googleapis.com/"
+          + "Instance\022Eapps/{app}/services/{service}/"
+          + "versions/{version}/instances/{instance}B"
+          + "\277\001\n\027com.google.appengine.v1B\rInstancePro"
+          + "toP\001Z<google.golang.org/genproto/googlea"
+          + "pis/appengine/v1;appengine\252\002\031Google.Clou"
+          + "d.AppEngine.V1\312\002\031Google\\Cloud\\AppEngine\\"
+          + "V1\352\002\034Google::Cloud::AppEngine::V1b\006proto"
+          + "3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -83,7 +83,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.ResourceProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_Instance_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -124,7 +123,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.ResourceProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/LocationProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/LocationProto.java
index e2d5c2e6..548746b0 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/LocationProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/LocationProto.java
@@ -42,23 +42,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n\"google/appengine/v1/location.proto\022\023go"
           + "ogle.appengine.v1\032\037google/api/field_beha"
-          + "vior.proto\032\034google/api/annotations.proto"
-          + "\"\205\001\n\020LocationMetadata\022&\n\036standard_enviro"
-          + "nment_available\030\002 \001(\010\022&\n\036flexible_enviro"
-          + "nment_available\030\004 \001(\010\022!\n\024search_api_avai"
-          + "lable\030\006 \001(\010B\003\340A\003B\277\001\n\027com.google.appengin"
-          + "e.v1B\rLocationProtoP\001Z<google.golang.org"
-          + "/genproto/googleapis/appengine/v1;appeng"
-          + "ine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Google"
-          + "\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::App"
-          + "Engine::V1b\006proto3"
+          + "vior.proto\"\205\001\n\020LocationMetadata\022&\n\036stand"
+          + "ard_environment_available\030\002 \001(\010\022&\n\036flexi"
+          + "ble_environment_available\030\004 \001(\010\022!\n\024searc"
+          + "h_api_available\030\006 \001(\010B\003\340A\003B\277\001\n\027com.googl"
+          + "e.appengine.v1B\rLocationProtoP\001Z<google."
+          + "golang.org/genproto/googleapis/appengine"
+          + "/v1;appengine\252\002\031Google.Cloud.AppEngine.V"
+          + "1\312\002\031Google\\Cloud\\AppEngine\\V1\352\002\034Google::"
+          + "Cloud::AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_LocationMetadata_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -74,7 +72,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
         descriptor, registry);
     com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/NetworkSettingsProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/NetworkSettingsProto.java
index 68dc9861..d745425f 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/NetworkSettingsProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/NetworkSettingsProto.java
@@ -41,28 +41,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n*google/appengine/v1/network_settings.p"
-          + "roto\022\023google.appengine.v1\032\034google/api/an"
-          + "notations.proto\"\252\002\n\017NetworkSettings\022[\n\027i"
-          + "ngress_traffic_allowed\030\001 \001(\0162:.google.ap"
-          + "pengine.v1.NetworkSettings.IngressTraffi"
-          + "cAllowed\"\271\001\n\025IngressTrafficAllowed\022\'\n#IN"
-          + "GRESS_TRAFFIC_ALLOWED_UNSPECIFIED\020\000\022\037\n\033I"
-          + "NGRESS_TRAFFIC_ALLOWED_ALL\020\001\022)\n%INGRESS_"
-          + "TRAFFIC_ALLOWED_INTERNAL_ONLY\020\002\022+\n\'INGRE"
-          + "SS_TRAFFIC_ALLOWED_INTERNAL_AND_LB\020\003B\306\001\n"
-          + "\027com.google.appengine.v1B\024NetworkSetting"
-          + "sProtoP\001Z<google.golang.org/genproto/goo"
-          + "gleapis/appengine/v1;appengine\252\002\031Google."
-          + "Cloud.AppEngine.V1\312\002\031Google\\Cloud\\AppEng"
-          + "ine\\V1\352\002\034Google::Cloud::AppEngine::V1b\006p"
-          + "roto3"
+          + "roto\022\023google.appengine.v1\"\252\002\n\017NetworkSet"
+          + "tings\022[\n\027ingress_traffic_allowed\030\001 \001(\0162:"
+          + ".google.appengine.v1.NetworkSettings.Ing"
+          + "ressTrafficAllowed\"\271\001\n\025IngressTrafficAll"
+          + "owed\022\'\n#INGRESS_TRAFFIC_ALLOWED_UNSPECIF"
+          + "IED\020\000\022\037\n\033INGRESS_TRAFFIC_ALLOWED_ALL\020\001\022)"
+          + "\n%INGRESS_TRAFFIC_ALLOWED_INTERNAL_ONLY\020"
+          + "\002\022+\n\'INGRESS_TRAFFIC_ALLOWED_INTERNAL_AN"
+          + "D_LB\020\003B\306\001\n\027com.google.appengine.v1B\024Netw"
+          + "orkSettingsProtoP\001Z<google.golang.org/ge"
+          + "nproto/googleapis/appengine/v1;appengine"
+          + "\252\002\031Google.Cloud.AppEngine.V1\312\002\031Google\\Cl"
+          + "oud\\AppEngine\\V1\352\002\034Google::Cloud::AppEng"
+          + "ine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.AnnotationsProto.getDescriptor(),
-            });
+            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
     internal_static_google_appengine_v1_NetworkSettings_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_appengine_v1_NetworkSettings_fieldAccessorTable =
@@ -71,7 +67,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "IngressTrafficAllowed",
             });
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/OperationProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/OperationProto.java
index e74bfce8..a186e919 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/OperationProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/OperationProto.java
@@ -45,31 +45,28 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n#google/appengine/v1/operation.proto\022\023g"
-          + "oogle.appengine.v1\032\036google/protobuf/dura"
-          + "tion.proto\032\037google/protobuf/timestamp.pr"
-          + "oto\032\034google/api/annotations.proto\"\262\002\n\023Op"
-          + "erationMetadataV1\022\016\n\006method\030\001 \001(\t\022/\n\013ins"
-          + "ert_time\030\002 \001(\0132\032.google.protobuf.Timesta"
-          + "mp\022,\n\010end_time\030\003 \001(\0132\032.google.protobuf.T"
-          + "imestamp\022\014\n\004user\030\004 \001(\t\022\016\n\006target\030\005 \001(\t\022\031"
-          + "\n\021ephemeral_message\030\006 \001(\t\022\017\n\007warning\030\007 \003"
-          + "(\t\022O\n\027create_version_metadata\030\010 \001(\0132,.go"
-          + "ogle.appengine.v1.CreateVersionMetadataV"
-          + "1H\000B\021\n\017method_metadata\"1\n\027CreateVersionM"
-          + "etadataV1\022\026\n\016cloud_build_id\030\001 \001(\tB\300\001\n\027co"
-          + "m.google.appengine.v1B\016OperationProtoP\001Z"
-          + "<google.golang.org/genproto/googleapis/a"
-          + "ppengine/v1;appengine\252\002\031Google.Cloud.App"
-          + "Engine.V1\312\002\031Google\\Cloud\\AppEngine\\V1\352\002\034"
-          + "Google::Cloud::AppEngine::V1b\006proto3"
+          + "oogle.appengine.v1\032\037google/protobuf/time"
+          + "stamp.proto\"\262\002\n\023OperationMetadataV1\022\016\n\006m"
+          + "ethod\030\001 \001(\t\022/\n\013insert_time\030\002 \001(\0132\032.googl"
+          + "e.protobuf.Timestamp\022,\n\010end_time\030\003 \001(\0132\032"
+          + ".google.protobuf.Timestamp\022\014\n\004user\030\004 \001(\t"
+          + "\022\016\n\006target\030\005 \001(\t\022\031\n\021ephemeral_message\030\006 "
+          + "\001(\t\022\017\n\007warning\030\007 \003(\t\022O\n\027create_version_m"
+          + "etadata\030\010 \001(\0132,.google.appengine.v1.Crea"
+          + "teVersionMetadataV1H\000B\021\n\017method_metadata"
+          + "\"1\n\027CreateVersionMetadataV1\022\026\n\016cloud_bui"
+          + "ld_id\030\001 \001(\tB\300\001\n\027com.google.appengine.v1B"
+          + "\016OperationProtoP\001Z<google.golang.org/gen"
+          + "proto/googleapis/appengine/v1;appengine\252"
+          + "\002\031Google.Cloud.AppEngine.V1\312\002\031Google\\Clo"
+          + "ud\\AppEngine\\V1\352\002\034Google::Cloud::AppEngi"
+          + "ne::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.protobuf.DurationProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_OperationMetadataV1_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -95,9 +92,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "CloudBuildId",
             });
-    com.google.protobuf.DurationProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ServiceProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ServiceProto.java
index 0c6e6d68..07bcd064 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ServiceProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/ServiceProto.java
@@ -50,30 +50,28 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n!google/appengine/v1/service.proto\022\023goo"
           + "gle.appengine.v1\032*google/appengine/v1/ne"
-          + "twork_settings.proto\032\034google/api/annotat"
-          + "ions.proto\"\225\001\n\007Service\022\014\n\004name\030\001 \001(\t\022\n\n\002"
-          + "id\030\002 \001(\t\0220\n\005split\030\003 \001(\0132!.google.appengi"
-          + "ne.v1.TrafficSplit\022>\n\020network_settings\030\006"
-          + " \001(\0132$.google.appengine.v1.NetworkSettin"
-          + "gs\"\204\002\n\014TrafficSplit\022;\n\010shard_by\030\001 \001(\0162)."
-          + "google.appengine.v1.TrafficSplit.ShardBy"
-          + "\022G\n\013allocations\030\002 \003(\01322.google.appengine"
-          + ".v1.TrafficSplit.AllocationsEntry\0322\n\020All"
-          + "ocationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001("
-          + "\001:\0028\001\":\n\007ShardBy\022\017\n\013UNSPECIFIED\020\000\022\n\n\006COO"
-          + "KIE\020\001\022\006\n\002IP\020\002\022\n\n\006RANDOM\020\003B\276\001\n\027com.google"
-          + ".appengine.v1B\014ServiceProtoP\001Z<google.go"
-          + "lang.org/genproto/googleapis/appengine/v"
-          + "1;appengine\252\002\031Google.Cloud.AppEngine.V1\312"
-          + "\002\031Google\\Cloud\\AppEngine\\V1\352\002\034Google::Cl"
-          + "oud::AppEngine::V1b\006proto3"
+          + "twork_settings.proto\"\225\001\n\007Service\022\014\n\004name"
+          + "\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\0220\n\005split\030\003 \001(\0132!.goog"
+          + "le.appengine.v1.TrafficSplit\022>\n\020network_"
+          + "settings\030\006 \001(\0132$.google.appengine.v1.Net"
+          + "workSettings\"\204\002\n\014TrafficSplit\022;\n\010shard_b"
+          + "y\030\001 \001(\0162).google.appengine.v1.TrafficSpl"
+          + "it.ShardBy\022G\n\013allocations\030\002 \003(\01322.google"
+          + ".appengine.v1.TrafficSplit.AllocationsEn"
+          + "try\0322\n\020AllocationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005"
+          + "value\030\002 \001(\001:\0028\001\":\n\007ShardBy\022\017\n\013UNSPECIFIE"
+          + "D\020\000\022\n\n\006COOKIE\020\001\022\006\n\002IP\020\002\022\n\n\006RANDOM\020\003B\276\001\n\027"
+          + "com.google.appengine.v1B\014ServiceProtoP\001Z"
+          + "<google.golang.org/genproto/googleapis/a"
+          + "ppengine/v1;appengine\252\002\031Google.Cloud.App"
+          + "Engine.V1\312\002\031Google\\Cloud\\AppEngine\\V1\352\002\034"
+          + "Google::Cloud::AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.appengine.v1.NetworkSettingsProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_Service_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -100,7 +98,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Key", "Value",
             });
     com.google.appengine.v1.NetworkSettingsProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/VersionProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/VersionProto.java
index 80fce766..c2b79ded 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/VersionProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/VersionProto.java
@@ -111,127 +111,125 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
       "\n!google/appengine/v1/version.proto\022\023goo"
           + "gle.appengine.v1\032\"google/appengine/v1/ap"
           + "p_yaml.proto\032 google/appengine/v1/deploy"
-          + ".proto\032*google/appengine/v1/network_sett"
-          + "ings.proto\032\036google/protobuf/duration.pro"
-          + "to\032\037google/protobuf/timestamp.proto\032\034goo"
-          + "gle/api/annotations.proto\"\365\016\n\007Version\022\014\n"
-          + "\004name\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\022B\n\021automatic_sca"
-          + "ling\030\003 \001(\0132%.google.appengine.v1.Automat"
-          + "icScalingH\000\022:\n\rbasic_scaling\030\004 \001(\0132!.goo"
-          + "gle.appengine.v1.BasicScalingH\000\022<\n\016manua"
-          + "l_scaling\030\005 \001(\0132\".google.appengine.v1.Ma"
-          + "nualScalingH\000\022A\n\020inbound_services\030\006 \003(\0162"
-          + "\'.google.appengine.v1.InboundServiceType"
-          + "\022\026\n\016instance_class\030\007 \001(\t\022-\n\007network\030\010 \001("
-          + "\0132\034.google.appengine.v1.Network\022\r\n\005zones"
-          + "\030v \003(\t\0221\n\tresources\030\t \001(\0132\036.google.appen"
-          + "gine.v1.Resources\022\017\n\007runtime\030\n \001(\t\022\027\n\017ru"
-          + "ntime_channel\030u \001(\t\022\022\n\nthreadsafe\030\013 \001(\010\022"
-          + "\n\n\002vm\030\014 \001(\010\022E\n\rbeta_settings\030\r \003(\0132..goo"
-          + "gle.appengine.v1.Version.BetaSettingsEnt"
-          + "ry\022\013\n\003env\030\016 \001(\t\022:\n\016serving_status\030\017 \001(\0162"
-          + "\".google.appengine.v1.ServingStatus\022\022\n\nc"
-          + "reated_by\030\020 \001(\t\022/\n\013create_time\030\021 \001(\0132\032.g"
-          + "oogle.protobuf.Timestamp\022\030\n\020disk_usage_b"
-          + "ytes\030\022 \001(\003\022\033\n\023runtime_api_version\030\025 \001(\t\022"
-          + "$\n\034runtime_main_executable_path\030\026 \001(\t\022\027\n"
-          + "\017service_account\030\177 \001(\t\022-\n\010handlers\030d \003(\013"
-          + "2\033.google.appengine.v1.UrlMap\0229\n\016error_h"
-          + "andlers\030e \003(\0132!.google.appengine.v1.Erro"
-          + "rHandler\022/\n\tlibraries\030f \003(\0132\034.google.app"
-          + "engine.v1.Library\0229\n\napi_config\030g \001(\0132%."
-          + "google.appengine.v1.ApiConfigHandler\022E\n\r"
-          + "env_variables\030h \003(\0132..google.appengine.v"
-          + "1.Version.EnvVariablesEntry\022P\n\023build_env"
-          + "_variables\030} \003(\01323.google.appengine.v1.V"
-          + "ersion.BuildEnvVariablesEntry\0225\n\022default"
-          + "_expiration\030i \001(\0132\031.google.protobuf.Dura"
-          + "tion\0226\n\014health_check\030j \001(\0132 .google.appe"
-          + "ngine.v1.HealthCheck\022<\n\017readiness_check\030"
-          + "p \001(\0132#.google.appengine.v1.ReadinessChe"
-          + "ck\022:\n\016liveness_check\030q \001(\0132\".google.appe"
-          + "ngine.v1.LivenessCheck\022\033\n\023nobuild_files_"
-          + "regex\030k \001(\t\0223\n\ndeployment\030l \001(\0132\037.google"
-          + ".appengine.v1.Deployment\022\023\n\013version_url\030"
-          + "m \001(\t\022G\n\025endpoints_api_service\030n \001(\0132(.g"
-          + "oogle.appengine.v1.EndpointsApiService\0223"
-          + "\n\nentrypoint\030z \001(\0132\037.google.appengine.v1"
-          + ".Entrypoint\022E\n\024vpc_access_connector\030y \001("
-          + "\0132\'.google.appengine.v1.VpcAccessConnect"
-          + "or\0323\n\021BetaSettingsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005"
-          + "value\030\002 \001(\t:\0028\001\0323\n\021EnvVariablesEntry\022\013\n\003"
-          + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0328\n\026BuildEnv"
-          + "VariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001"
-          + "(\t:\0028\001B\t\n\007scaling\"\367\001\n\023EndpointsApiServic"
-          + "e\022\014\n\004name\030\001 \001(\t\022\021\n\tconfig_id\030\002 \001(\t\022R\n\020ro"
-          + "llout_strategy\030\003 \001(\01628.google.appengine."
-          + "v1.EndpointsApiService.RolloutStrategy\022\036"
-          + "\n\026disable_trace_sampling\030\004 \001(\010\"K\n\017Rollou"
-          + "tStrategy\022 \n\034UNSPECIFIED_ROLLOUT_STRATEG"
-          + "Y\020\000\022\t\n\005FIXED\020\001\022\013\n\007MANAGED\020\002\"\251\005\n\020Automati"
-          + "cScaling\0223\n\020cool_down_period\030\001 \001(\0132\031.goo"
-          + "gle.protobuf.Duration\022<\n\017cpu_utilization"
-          + "\030\002 \001(\0132#.google.appengine.v1.CpuUtilizat"
-          + "ion\022\037\n\027max_concurrent_requests\030\003 \001(\005\022\032\n\022"
-          + "max_idle_instances\030\004 \001(\005\022\033\n\023max_total_in"
-          + "stances\030\005 \001(\005\0226\n\023max_pending_latency\030\006 \001"
-          + "(\0132\031.google.protobuf.Duration\022\032\n\022min_idl"
-          + "e_instances\030\007 \001(\005\022\033\n\023min_total_instances"
-          + "\030\010 \001(\005\0226\n\023min_pending_latency\030\t \001(\0132\031.go"
-          + "ogle.protobuf.Duration\022D\n\023request_utiliz"
-          + "ation\030\n \001(\0132\'.google.appengine.v1.Reques"
-          + "tUtilization\022>\n\020disk_utilization\030\013 \001(\0132$"
-          + ".google.appengine.v1.DiskUtilization\022D\n\023"
-          + "network_utilization\030\014 \001(\0132\'.google.appen"
-          + "gine.v1.NetworkUtilization\022S\n\033standard_s"
-          + "cheduler_settings\030\024 \001(\0132..google.appengi"
-          + "ne.v1.StandardSchedulerSettings\"V\n\014Basic"
-          + "Scaling\022/\n\014idle_timeout\030\001 \001(\0132\031.google.p"
-          + "rotobuf.Duration\022\025\n\rmax_instances\030\002 \001(\005\""
-          + "\"\n\rManualScaling\022\021\n\tinstances\030\001 \001(\005\"j\n\016C"
-          + "puUtilization\022<\n\031aggregation_window_leng"
-          + "th\030\001 \001(\0132\031.google.protobuf.Duration\022\032\n\022t"
-          + "arget_utilization\030\002 \001(\001\"a\n\022RequestUtiliz"
-          + "ation\022\'\n\037target_request_count_per_second"
-          + "\030\001 \001(\005\022\"\n\032target_concurrent_requests\030\002 \001"
-          + "(\005\"\247\001\n\017DiskUtilization\022%\n\035target_write_b"
-          + "ytes_per_second\030\016 \001(\005\022#\n\033target_write_op"
-          + "s_per_second\030\017 \001(\005\022$\n\034target_read_bytes_"
-          + "per_second\030\020 \001(\005\022\"\n\032target_read_ops_per_"
-          + "second\030\021 \001(\005\"\270\001\n\022NetworkUtilization\022$\n\034t"
-          + "arget_sent_bytes_per_second\030\001 \001(\005\022&\n\036tar"
-          + "get_sent_packets_per_second\030\013 \001(\005\022(\n tar"
-          + "get_received_bytes_per_second\030\014 \001(\005\022*\n\"t"
-          + "arget_received_packets_per_second\030\r \001(\005\""
-          + "\220\001\n\031StandardSchedulerSettings\022\036\n\026target_"
-          + "cpu_utilization\030\001 \001(\001\022%\n\035target_throughp"
-          + "ut_utilization\030\002 \001(\001\022\025\n\rmin_instances\030\003 "
-          + "\001(\005\022\025\n\rmax_instances\030\004 \001(\005\"y\n\007Network\022\027\n"
-          + "\017forwarded_ports\030\001 \003(\t\022\024\n\014instance_tag\030\002"
-          + " \001(\t\022\014\n\004name\030\003 \001(\t\022\027\n\017subnetwork_name\030\004 "
-          + "\001(\t\022\030\n\020session_affinity\030\005 \001(\010\"<\n\006Volume\022"
-          + "\014\n\004name\030\001 \001(\t\022\023\n\013volume_type\030\002 \001(\t\022\017\n\007si"
-          + "ze_gb\030\003 \001(\001\"\205\001\n\tResources\022\013\n\003cpu\030\001 \001(\001\022\017"
-          + "\n\007disk_gb\030\002 \001(\001\022\021\n\tmemory_gb\030\003 \001(\001\022,\n\007vo"
-          + "lumes\030\004 \003(\0132\033.google.appengine.v1.Volume"
-          + "\022\031\n\021kms_key_reference\030\005 \001(\t\"\"\n\022VpcAccess"
-          + "Connector\022\014\n\004name\030\001 \001(\t\"(\n\nEntrypoint\022\017\n"
-          + "\005shell\030\001 \001(\tH\000B\t\n\007command*\273\002\n\022InboundSer"
-          + "viceType\022\037\n\033INBOUND_SERVICE_UNSPECIFIED\020"
-          + "\000\022\030\n\024INBOUND_SERVICE_MAIL\020\001\022\037\n\033INBOUND_S"
-          + "ERVICE_MAIL_BOUNCE\020\002\022\036\n\032INBOUND_SERVICE_"
-          + "XMPP_ERROR\020\003\022 \n\034INBOUND_SERVICE_XMPP_MES"
-          + "SAGE\020\004\022\"\n\036INBOUND_SERVICE_XMPP_SUBSCRIBE"
-          + "\020\005\022!\n\035INBOUND_SERVICE_XMPP_PRESENCE\020\006\022$\n"
-          + " INBOUND_SERVICE_CHANNEL_PRESENCE\020\007\022\032\n\026I"
-          + "NBOUND_SERVICE_WARMUP\020\t*I\n\rServingStatus"
-          + "\022\036\n\032SERVING_STATUS_UNSPECIFIED\020\000\022\013\n\007SERV"
-          + "ING\020\001\022\013\n\007STOPPED\020\002B\276\001\n\027com.google.appeng"
-          + "ine.v1B\014VersionProtoP\001Z<google.golang.or"
-          + "g/genproto/googleapis/appengine/v1;appen"
-          + "gine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Googl"
-          + "e\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::Ap"
-          + "pEngine::V1b\006proto3"
+          + ".proto\032\036google/protobuf/duration.proto\032\037"
+          + "google/protobuf/timestamp.proto\"\365\016\n\007Vers"
+          + "ion\022\014\n\004name\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\022B\n\021automat"
+          + "ic_scaling\030\003 \001(\0132%.google.appengine.v1.A"
+          + "utomaticScalingH\000\022:\n\rbasic_scaling\030\004 \001(\013"
+          + "2!.google.appengine.v1.BasicScalingH\000\022<\n"
+          + "\016manual_scaling\030\005 \001(\0132\".google.appengine"
+          + ".v1.ManualScalingH\000\022A\n\020inbound_services\030"
+          + "\006 \003(\0162\'.google.appengine.v1.InboundServi"
+          + "ceType\022\026\n\016instance_class\030\007 \001(\t\022-\n\007networ"
+          + "k\030\010 \001(\0132\034.google.appengine.v1.Network\022\r\n"
+          + "\005zones\030v \003(\t\0221\n\tresources\030\t \001(\0132\036.google"
+          + ".appengine.v1.Resources\022\017\n\007runtime\030\n \001(\t"
+          + "\022\027\n\017runtime_channel\030u \001(\t\022\022\n\nthreadsafe\030"
+          + "\013 \001(\010\022\n\n\002vm\030\014 \001(\010\022E\n\rbeta_settings\030\r \003(\013"
+          + "2..google.appengine.v1.Version.BetaSetti"
+          + "ngsEntry\022\013\n\003env\030\016 \001(\t\022:\n\016serving_status\030"
+          + "\017 \001(\0162\".google.appengine.v1.ServingStatu"
+          + "s\022\022\n\ncreated_by\030\020 \001(\t\022/\n\013create_time\030\021 \001"
+          + "(\0132\032.google.protobuf.Timestamp\022\030\n\020disk_u"
+          + "sage_bytes\030\022 \001(\003\022\033\n\023runtime_api_version\030"
+          + "\025 \001(\t\022$\n\034runtime_main_executable_path\030\026 "
+          + "\001(\t\022\027\n\017service_account\030\177 \001(\t\022-\n\010handlers"
+          + "\030d \003(\0132\033.google.appengine.v1.UrlMap\0229\n\016e"
+          + "rror_handlers\030e \003(\0132!.google.appengine.v"
+          + "1.ErrorHandler\022/\n\tlibraries\030f \003(\0132\034.goog"
+          + "le.appengine.v1.Library\0229\n\napi_config\030g "
+          + "\001(\0132%.google.appengine.v1.ApiConfigHandl"
+          + "er\022E\n\renv_variables\030h \003(\0132..google.appen"
+          + "gine.v1.Version.EnvVariablesEntry\022P\n\023bui"
+          + "ld_env_variables\030} \003(\01323.google.appengin"
+          + "e.v1.Version.BuildEnvVariablesEntry\0225\n\022d"
+          + "efault_expiration\030i \001(\0132\031.google.protobu"
+          + "f.Duration\0226\n\014health_check\030j \001(\0132 .googl"
+          + "e.appengine.v1.HealthCheck\022<\n\017readiness_"
+          + "check\030p \001(\0132#.google.appengine.v1.Readin"
+          + "essCheck\022:\n\016liveness_check\030q \001(\0132\".googl"
+          + "e.appengine.v1.LivenessCheck\022\033\n\023nobuild_"
+          + "files_regex\030k \001(\t\0223\n\ndeployment\030l \001(\0132\037."
+          + "google.appengine.v1.Deployment\022\023\n\013versio"
+          + "n_url\030m \001(\t\022G\n\025endpoints_api_service\030n \001"
+          + "(\0132(.google.appengine.v1.EndpointsApiSer"
+          + "vice\0223\n\nentrypoint\030z \001(\0132\037.google.appeng"
+          + "ine.v1.Entrypoint\022E\n\024vpc_access_connecto"
+          + "r\030y \001(\0132\'.google.appengine.v1.VpcAccessC"
+          + "onnector\0323\n\021BetaSettingsEntry\022\013\n\003key\030\001 \001"
+          + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0323\n\021EnvVariablesEnt"
+          + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0328\n\026Bu"
+          + "ildEnvVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val"
+          + "ue\030\002 \001(\t:\0028\001B\t\n\007scaling\"\367\001\n\023EndpointsApi"
+          + "Service\022\014\n\004name\030\001 \001(\t\022\021\n\tconfig_id\030\002 \001(\t"
+          + "\022R\n\020rollout_strategy\030\003 \001(\01628.google.appe"
+          + "ngine.v1.EndpointsApiService.RolloutStra"
+          + "tegy\022\036\n\026disable_trace_sampling\030\004 \001(\010\"K\n\017"
+          + "RolloutStrategy\022 \n\034UNSPECIFIED_ROLLOUT_S"
+          + "TRATEGY\020\000\022\t\n\005FIXED\020\001\022\013\n\007MANAGED\020\002\"\251\005\n\020Au"
+          + "tomaticScaling\0223\n\020cool_down_period\030\001 \001(\013"
+          + "2\031.google.protobuf.Duration\022<\n\017cpu_utili"
+          + "zation\030\002 \001(\0132#.google.appengine.v1.CpuUt"
+          + "ilization\022\037\n\027max_concurrent_requests\030\003 \001"
+          + "(\005\022\032\n\022max_idle_instances\030\004 \001(\005\022\033\n\023max_to"
+          + "tal_instances\030\005 \001(\005\0226\n\023max_pending_laten"
+          + "cy\030\006 \001(\0132\031.google.protobuf.Duration\022\032\n\022m"
+          + "in_idle_instances\030\007 \001(\005\022\033\n\023min_total_ins"
+          + "tances\030\010 \001(\005\0226\n\023min_pending_latency\030\t \001("
+          + "\0132\031.google.protobuf.Duration\022D\n\023request_"
+          + "utilization\030\n \001(\0132\'.google.appengine.v1."
+          + "RequestUtilization\022>\n\020disk_utilization\030\013"
+          + " \001(\0132$.google.appengine.v1.DiskUtilizati"
+          + "on\022D\n\023network_utilization\030\014 \001(\0132\'.google"
+          + ".appengine.v1.NetworkUtilization\022S\n\033stan"
+          + "dard_scheduler_settings\030\024 \001(\0132..google.a"
+          + "ppengine.v1.StandardSchedulerSettings\"V\n"
+          + "\014BasicScaling\022/\n\014idle_timeout\030\001 \001(\0132\031.go"
+          + "ogle.protobuf.Duration\022\025\n\rmax_instances\030"
+          + "\002 \001(\005\"\"\n\rManualScaling\022\021\n\tinstances\030\001 \001("
+          + "\005\"j\n\016CpuUtilization\022<\n\031aggregation_windo"
+          + "w_length\030\001 \001(\0132\031.google.protobuf.Duratio"
+          + "n\022\032\n\022target_utilization\030\002 \001(\001\"a\n\022Request"
+          + "Utilization\022\'\n\037target_request_count_per_"
+          + "second\030\001 \001(\005\022\"\n\032target_concurrent_reques"
+          + "ts\030\002 \001(\005\"\247\001\n\017DiskUtilization\022%\n\035target_w"
+          + "rite_bytes_per_second\030\016 \001(\005\022#\n\033target_wr"
+          + "ite_ops_per_second\030\017 \001(\005\022$\n\034target_read_"
+          + "bytes_per_second\030\020 \001(\005\022\"\n\032target_read_op"
+          + "s_per_second\030\021 \001(\005\"\270\001\n\022NetworkUtilizatio"
+          + "n\022$\n\034target_sent_bytes_per_second\030\001 \001(\005\022"
+          + "&\n\036target_sent_packets_per_second\030\013 \001(\005\022"
+          + "(\n target_received_bytes_per_second\030\014 \001("
+          + "\005\022*\n\"target_received_packets_per_second\030"
+          + "\r \001(\005\"\220\001\n\031StandardSchedulerSettings\022\036\n\026t"
+          + "arget_cpu_utilization\030\001 \001(\001\022%\n\035target_th"
+          + "roughput_utilization\030\002 \001(\001\022\025\n\rmin_instan"
+          + "ces\030\003 \001(\005\022\025\n\rmax_instances\030\004 \001(\005\"y\n\007Netw"
+          + "ork\022\027\n\017forwarded_ports\030\001 \003(\t\022\024\n\014instance"
+          + "_tag\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022\027\n\017subnetwork_n"
+          + "ame\030\004 \001(\t\022\030\n\020session_affinity\030\005 \001(\010\"<\n\006V"
+          + "olume\022\014\n\004name\030\001 \001(\t\022\023\n\013volume_type\030\002 \001(\t"
+          + "\022\017\n\007size_gb\030\003 \001(\001\"\205\001\n\tResources\022\013\n\003cpu\030\001"
+          + " \001(\001\022\017\n\007disk_gb\030\002 \001(\001\022\021\n\tmemory_gb\030\003 \001(\001"
+          + "\022,\n\007volumes\030\004 \003(\0132\033.google.appengine.v1."
+          + "Volume\022\031\n\021kms_key_reference\030\005 \001(\t\"\"\n\022Vpc"
+          + "AccessConnector\022\014\n\004name\030\001 \001(\t\"(\n\nEntrypo"
+          + "int\022\017\n\005shell\030\001 \001(\tH\000B\t\n\007command*\273\002\n\022Inbo"
+          + "undServiceType\022\037\n\033INBOUND_SERVICE_UNSPEC"
+          + "IFIED\020\000\022\030\n\024INBOUND_SERVICE_MAIL\020\001\022\037\n\033INB"
+          + "OUND_SERVICE_MAIL_BOUNCE\020\002\022\036\n\032INBOUND_SE"
+          + "RVICE_XMPP_ERROR\020\003\022 \n\034INBOUND_SERVICE_XM"
+          + "PP_MESSAGE\020\004\022\"\n\036INBOUND_SERVICE_XMPP_SUB"
+          + "SCRIBE\020\005\022!\n\035INBOUND_SERVICE_XMPP_PRESENC"
+          + "E\020\006\022$\n INBOUND_SERVICE_CHANNEL_PRESENCE\020"
+          + "\007\022\032\n\026INBOUND_SERVICE_WARMUP\020\t*I\n\rServing"
+          + "Status\022\036\n\032SERVING_STATUS_UNSPECIFIED\020\000\022\013"
+          + "\n\007SERVING\020\001\022\013\n\007STOPPED\020\002B\276\001\n\027com.google."
+          + "appengine.v1B\014VersionProtoP\001Z<google.gol"
+          + "ang.org/genproto/googleapis/appengine/v1"
+          + ";appengine\252\002\031Google.Cloud.AppEngine.V1\312\002"
+          + "\031Google\\Cloud\\AppEngine\\V1\352\002\034Google::Clo"
+          + "ud::AppEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -239,10 +237,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.appengine.v1.AppYamlProto.getDescriptor(),
               com.google.appengine.v1.DeployProto.getDescriptor(),
-              com.google.appengine.v1.NetworkSettingsProto.getDescriptor(),
               com.google.protobuf.DurationProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_appengine_v1_Version_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -447,10 +443,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             });
     com.google.appengine.v1.AppYamlProto.getDescriptor();
     com.google.appengine.v1.DeployProto.getDescriptor();
-    com.google.appengine.v1.NetworkSettingsProto.getDescriptor();
     com.google.protobuf.DurationProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/firewall/FirewallProto.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/firewall/FirewallProto.java
index 1a28ae78..af86b5f0 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/firewall/FirewallProto.java
+++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/firewall/FirewallProto.java
@@ -41,25 +41,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n\"google/appengine/v1/firewall.proto\022\023go"
-          + "ogle.appengine.v1\032\034google/api/annotation"
-          + "s.proto\"\274\001\n\014FirewallRule\022\020\n\010priority\030\001 \001"
-          + "(\005\0228\n\006action\030\002 \001(\0162(.google.appengine.v1"
-          + ".FirewallRule.Action\022\024\n\014source_range\030\003 \001"
-          + "(\t\022\023\n\013description\030\004 \001(\t\"5\n\006Action\022\026\n\022UNS"
-          + "PECIFIED_ACTION\020\000\022\t\n\005ALLOW\020\001\022\010\n\004DENY\020\002B\310"
-          + "\001\n com.google.appengine.v1.firewallB\rFir"
-          + "ewallProtoP\001Z<google.golang.org/genproto"
-          + "/googleapis/appengine/v1;appengine\252\002\031Goo"
-          + "gle.Cloud.AppEngine.V1\312\002\031Google\\Cloud\\Ap"
-          + "pEngine\\V1\352\002\034Google::Cloud::AppEngine::V"
-          + "1b\006proto3"
+          + "ogle.appengine.v1\"\274\001\n\014FirewallRule\022\020\n\010pr"
+          + "iority\030\001 \001(\005\0228\n\006action\030\002 \001(\0162(.google.ap"
+          + "pengine.v1.FirewallRule.Action\022\024\n\014source"
+          + "_range\030\003 \001(\t\022\023\n\013description\030\004 \001(\t\"5\n\006Act"
+          + "ion\022\026\n\022UNSPECIFIED_ACTION\020\000\022\t\n\005ALLOW\020\001\022\010"
+          + "\n\004DENY\020\002B\310\001\n com.google.appengine.v1.fir"
+          + "ewallB\rFirewallProtoP\001Z<google.golang.or"
+          + "g/genproto/googleapis/appengine/v1;appen"
+          + "gine\252\002\031Google.Cloud.AppEngine.V1\312\002\031Googl"
+          + "e\\Cloud\\AppEngine\\V1\352\002\034Google::Cloud::Ap"
+          + "pEngine::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.AnnotationsProto.getDescriptor(),
-            });
+            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
     internal_static_google_appengine_v1_FirewallRule_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_appengine_v1_FirewallRule_fieldAccessorTable =
@@ -68,7 +64,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Priority", "Action", "SourceRange", "Description",
             });
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/app_yaml.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/app_yaml.proto
index 657ad97f..af5168c3 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/app_yaml.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/app_yaml.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/protobuf/duration.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/application.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/application.proto
index ca4e6b0b..f05e8e61 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/application.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/application.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/protobuf/duration.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/audit_data.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/audit_data.proto
index 101dd71c..d839280d 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/audit_data.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/audit_data.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/appengine/v1/appengine.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/certificate.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/certificate.proto
index 9ce5e72d..037465be 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/certificate.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/certificate.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/protobuf/timestamp.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deploy.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deploy.proto
index 4d9d2c16..f1dcccc0 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deploy.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deploy.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/protobuf/duration.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deployed_files.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deployed_files.proto
index b9024c86..67e9b703 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deployed_files.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/deployed_files.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.appengine.v1;
 
-import "google/api/annotations.proto";
-
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
 option java_multiple_files = true;
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain.proto
index 70951382..cd39adfb 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.appengine.v1;
 
-import "google/api/annotations.proto";
-
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
 option java_multiple_files = true;
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain_mapping.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain_mapping.proto
index d0cfec75..f307217a 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain_mapping.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/domain_mapping.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.appengine.v1;
 
-import "google/api/annotations.proto";
-
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
 option java_multiple_files = true;
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/firewall.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/firewall.proto
index ba4e9634..d7172f7e 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/firewall.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/firewall.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.appengine.v1;
 
-import "google/api/annotations.proto";
-
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
 option java_multiple_files = true;
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/instance.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/instance.proto
index d2f314f8..cc7369b0 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/instance.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/instance.proto
@@ -19,7 +19,6 @@ package google.appengine.v1;
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "google/protobuf/timestamp.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/location.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/location.proto
index f150188f..b866f76d 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/location.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/location.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/network_settings.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/network_settings.proto
index b6dab212..7cf70c00 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/network_settings.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/network_settings.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.appengine.v1;
 
-import "google/api/annotations.proto";
-
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
 option java_multiple_files = true;
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/operation.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/operation.proto
index a8d4f7cd..8609b17b 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/operation.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/operation.proto
@@ -16,9 +16,7 @@ syntax = "proto3";
 
 package google.appengine.v1;
 
-import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/service.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/service.proto
index 7c03d835..284d880f 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/service.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/service.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.appengine.v1;
 
 import "google/appengine/v1/network_settings.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/version.proto b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/version.proto
index 4f253b02..38cfd11e 100644
--- a/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/version.proto
+++ b/proto-google-cloud-appengine-admin-v1/src/main/proto/google/appengine/v1/version.proto
@@ -18,10 +18,8 @@ package google.appengine.v1;
 
 import "google/appengine/v1/app_yaml.proto";
 import "google/appengine/v1/deploy.proto";
-import "google/appengine/v1/network_settings.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.AppEngine.V1";
 option go_package = "google.golang.org/genproto/googleapis/appengine/v1;appengine";
diff --git a/samples/pom.xml b/samples/pom.xml
index 9991ef6a..85036a04 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.8</version>
+        <version>1.6.11</version>
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
diff --git a/versions.txt b/versions.txt
index 70a00301..28e49936 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-appengine-admin:2.1.6:2.1.6
-grpc-google-cloud-appengine-admin-v1:2.1.6:2.1.6
-proto-google-cloud-appengine-admin-v1:2.1.6:2.1.6
+google-cloud-appengine-admin:2.1.7:2.1.7
+grpc-google-cloud-appengine-admin-v1:2.1.7:2.1.7
+proto-google-cloud-appengine-admin-v1:2.1.7:2.1.7