diff --git a/generated/java/grpc-google-common-protos/build.gradle b/generated/java/grpc-google-common-protos/build.gradle
index 1b98d3c5f..418dab114 100644
--- a/generated/java/grpc-google-common-protos/build.gradle
+++ b/generated/java/grpc-google-common-protos/build.gradle
@@ -6,9 +6,9 @@ buildscript {
 
 apply plugin: 'java'
 
-description = 'GRPC library for grpc-google-common-protos'
+description = 'GRPC library for grpc-google-common-protos (prerelease)'
 group = 'com.google.api.grpc'
-version = "1.12.0"
+version = '1.13.0-pre1'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
@@ -46,4 +46,4 @@ artifacts {
 }
 
 compileJava.options.encoding = 'UTF-8'
-javadoc.options.encoding = 'UTF-8'
\ No newline at end of file
+javadoc.options.encoding = 'UTF-8'
diff --git a/generated/java/proto-google-common-protos/build.gradle b/generated/java/proto-google-common-protos/build.gradle
index 6c8c082e3..43681625f 100644
--- a/generated/java/proto-google-common-protos/build.gradle
+++ b/generated/java/proto-google-common-protos/build.gradle
@@ -6,9 +6,9 @@ buildscript {
 
 apply plugin: 'java'
 
-description = 'PROTO library for proto-google-common-protos'
+description = 'PROTO library for proto-google-common-protos (prerelease)'
 group = 'com.google.api.grpc'
-version = "1.12.0"
+version = '1.13.0-pre1'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
@@ -47,4 +47,4 @@ artifacts {
 }
 
 compileJava.options.encoding = 'UTF-8'
-javadoc.options.encoding = 'UTF-8'
\ No newline at end of file
+javadoc.options.encoding = 'UTF-8'
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Advice.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Advice.java
index 61deace44..cb1cd4fa8 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Advice.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Advice.java
@@ -48,6 +48,12 @@ private Advice(
           case 0:
             done = true;
             break;
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            description_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -55,12 +61,6 @@ private Advice(
             }
             break;
           }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            description_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,6 +78,7 @@ private Advice(
     return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_fieldAccessorTable
@@ -130,6 +131,7 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -139,6 +141,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDescriptionBytes().isEmpty()) {
@@ -147,6 +150,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -261,6 +265,7 @@ public static com.google.api.Advice parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -268,6 +273,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Advice prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -296,6 +302,7 @@ public static final class Builder extends
       return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_fieldAccessorTable
@@ -318,6 +325,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       description_ = "";
@@ -325,15 +333,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Advice getDefaultInstanceForType() {
       return com.google.api.Advice.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Advice build() {
       com.google.api.Advice result = buildPartial();
       if (!result.isInitialized()) {
@@ -342,6 +353,7 @@ public com.google.api.Advice build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Advice buildPartial() {
       com.google.api.Advice result = new com.google.api.Advice(this);
       result.description_ = description_;
@@ -349,32 +361,39 @@ public com.google.api.Advice buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Advice) {
         return mergeFrom((com.google.api.Advice)other);
@@ -395,10 +414,12 @@ public Builder mergeFrom(com.google.api.Advice other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -510,11 +531,13 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -536,6 +559,7 @@ public static com.google.api.Advice getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Advice>
       PARSER = new com.google.protobuf.AbstractParser<Advice>() {
+    @java.lang.Override
     public Advice parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -553,6 +577,7 @@ public com.google.protobuf.Parser<Advice> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Advice getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java
index 83a057172..3803da6b2 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java
@@ -7,6 +7,15 @@ public final class AnnotationsProto {
   private AnnotationsProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(com.google.api.AnnotationsProto.metadata);
+    registry.add(com.google.api.AnnotationsProto.defaultHost);
+    registry.add(com.google.api.AnnotationsProto.oauth);
+    registry.add(com.google.api.AnnotationsProto.resource);
+    registry.add(com.google.api.AnnotationsProto.resourceSet);
+    registry.add(com.google.api.AnnotationsProto.resourceType);
+    registry.add(com.google.api.AnnotationsProto.required);
+    registry.add(com.google.api.AnnotationsProto.retry);
+    registry.add(com.google.api.AnnotationsProto.methodSignature);
     registry.add(com.google.api.AnnotationsProto.http);
   }
 
@@ -15,10 +24,161 @@ public static void registerAllExtensions(
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
+  public static final int METADATA_FIELD_NUMBER = 1048;
+  /**
+   * <pre>
+   * Packaging information.
+   * See `google/api/metadata.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.FileOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FileOptions,
+      com.google.api.Metadata> metadata = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.api.Metadata.class,
+        com.google.api.Metadata.getDefaultInstance());
+  public static final int DEFAULT_HOST_FIELD_NUMBER = 1049;
+  /**
+   * <pre>
+   * Required. The hostname for this service (e.g. "foo.googleapis.com").
+   * This should be specified with no prefix.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.ServiceOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.ServiceOptions,
+      java.lang.String> defaultHost = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int OAUTH_FIELD_NUMBER = 1050;
+  /**
+   * <pre>
+   * Required. OAuth information for the client.
+   * The "scopes" key is a repeated string; see `google/api/metadata.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.ServiceOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.ServiceOptions,
+      com.google.api.OAuth> oauth = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.api.OAuth.class,
+        com.google.api.OAuth.getDefaultInstance());
+  public static final int RESOURCE_FIELD_NUMBER = 1053;
+  /**
+   * <pre>
+   * A representation of the resource.
+   * This is generally intended to be attached to the "name" field.
+   * See `google/api/resources.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      com.google.api.Resource> resource = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.api.Resource.class,
+        com.google.api.Resource.getDefaultInstance());
+  public static final int RESOURCE_SET_FIELD_NUMBER = 1054;
+  /**
+   * <pre>
+   * A representation of a set of resources, any of which may be
+   * represented.
+   * This is generally intended to be attached to the "name" field
+   * and is mutually exclusive with `resource`.
+   * See `google/api/resources.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      com.google.api.ResourceSet> resourceSet = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.api.ResourceSet.class,
+        com.google.api.ResourceSet.getDefaultInstance());
+  public static final int RESOURCE_TYPE_FIELD_NUMBER = 1055;
+  /**
+   * <pre>
+   * The fully qualified message name of the type that this references.
+   * Marks this as a field referring to a resource in another message.
+   * See `google/api/resources.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.String> resourceType = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int REQUIRED_FIELD_NUMBER = 1052;
+  /**
+   * <pre>
+   * A designation of a specific field as required in requests.
+   * Complements `method_signature` in the method options;
+   * see `google/api/signature.proto` for more details.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> required = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int RETRY_FIELD_NUMBER = 1056;
+  /**
+   * <pre>
+   * Retry information for the applicable method.
+   * See `google/api/retry.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.MethodOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.MethodOptions,
+      com.google.api.Retry> retry = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.api.Retry.class,
+        com.google.api.Retry.getDefaultInstance());
+  public static final int METHOD_SIGNATURE_FIELD_NUMBER = 1051;
+  /**
+   * <pre>
+   * The parameter lists defined for this method.
+   * See `google/api/signature.proto`.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.MethodOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.MethodOptions,
+      com.google.api.MethodSignature> methodSignature = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.api.MethodSignature.class,
+        com.google.api.MethodSignature.getDefaultInstance());
   public static final int HTTP_FIELD_NUMBER = 72295728;
   /**
    * <pre>
-   * See `HttpRule`.
+   * The HTTP bindings for this method.
+   * See `google/api/http.proto`.
    * </pre>
    *
    * <code>extend .google.protobuf.MethodOptions { ... }</code>
@@ -30,6 +190,16 @@ public static void registerAllExtensions(
           .newFileScopedGeneratedExtension(
         com.google.api.HttpRule.class,
         com.google.api.HttpRule.getDefaultInstance());
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_api_Project_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_api_Project_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_api_Organization_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_api_Organization_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -40,13 +210,33 @@ public static void registerAllExtensions(
   static {
     java.lang.String[] descriptorData = {
       "\n\034google/api/annotations.proto\022\ngoogle.a" +
-      "pi\032\025google/api/http.proto\032 google/protob" +
-      "uf/descriptor.proto:E\n\004http\022\036.google.pro" +
-      "tobuf.MethodOptions\030\260\312\274\" \001(\0132\024.google.ap" +
-      "i.HttpRuleBn\n\016com.google.apiB\020Annotation" +
-      "sProtoP\001ZAgoogle.golang.org/genproto/goo" +
-      "gleapis/api/annotations;annotations\242\002\004GA" +
-      "PIb\006proto3"
+      "pi\032\025google/api/http.proto\032\031google/api/me" +
+      "tadata.proto\032\032google/api/resources.proto" +
+      "\032\026google/api/retry.proto\032\032google/api/sig" +
+      "nature.proto\032 google/protobuf/descriptor" +
+      ".proto\"(\n\007Project\022\035\n\004name\030\001 \001(\tB\017\352A\014\n\npr" +
+      "ojects/*\"2\n\014Organization\022\"\n\004name\030\001 \001(\tB\024" +
+      "\352A\021\n\017organizations/*:E\n\010metadata\022\034.googl" +
+      "e.protobuf.FileOptions\030\230\010 \001(\0132\024.google.a" +
+      "pi.Metadata:6\n\014default_host\022\037.google.pro" +
+      "tobuf.ServiceOptions\030\231\010 \001(\t:B\n\005oauth\022\037.g" +
+      "oogle.protobuf.ServiceOptions\030\232\010 \001(\0132\021.g" +
+      "oogle.api.OAuth:F\n\010resource\022\035.google.pro" +
+      "tobuf.FieldOptions\030\235\010 \001(\0132\024.google.api.R" +
+      "esource:M\n\014resource_set\022\035.google.protobu" +
+      "f.FieldOptions\030\236\010 \001(\0132\027.google.api.Resou" +
+      "rceSet:5\n\rresource_type\022\035.google.protobu" +
+      "f.FieldOptions\030\237\010 \001(\t:0\n\010required\022\035.goog" +
+      "le.protobuf.FieldOptions\030\234\010 \001(\010:A\n\005retry" +
+      "\022\036.google.protobuf.MethodOptions\030\240\010 \001(\0132" +
+      "\021.google.api.Retry:V\n\020method_signature\022\036" +
+      ".google.protobuf.MethodOptions\030\233\010 \001(\0132\033." +
+      "google.api.MethodSignature:E\n\004http\022\036.goo" +
+      "gle.protobuf.MethodOptions\030\260\312\274\" \001(\0132\024.go" +
+      "ogle.api.HttpRuleBn\n\016com.google.apiB\020Ann" +
+      "otationsProtoP\001ZAgoogle.golang.org/genpr" +
+      "oto/googleapis/api/annotations;annotatio" +
+      "ns\242\002\004GAPIb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -60,10 +250,44 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           com.google.api.HttpProto.getDescriptor(),
+          com.google.api.MetadataProto.getDescriptor(),
+          com.google.api.ResourcesProto.getDescriptor(),
+          com.google.api.RetryProto.getDescriptor(),
+          com.google.api.SignatureProto.getDescriptor(),
           com.google.protobuf.DescriptorProtos.getDescriptor(),
         }, assigner);
-    http.internalInit(descriptor.getExtensions().get(0));
+    internal_static_google_api_Project_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_api_Project_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_api_Project_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_api_Organization_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_api_Organization_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_api_Organization_descriptor,
+        new java.lang.String[] { "Name", });
+    metadata.internalInit(descriptor.getExtensions().get(0));
+    defaultHost.internalInit(descriptor.getExtensions().get(1));
+    oauth.internalInit(descriptor.getExtensions().get(2));
+    resource.internalInit(descriptor.getExtensions().get(3));
+    resourceSet.internalInit(descriptor.getExtensions().get(4));
+    resourceType.internalInit(descriptor.getExtensions().get(5));
+    required.internalInit(descriptor.getExtensions().get(6));
+    retry.internalInit(descriptor.getExtensions().get(7));
+    methodSignature.internalInit(descriptor.getExtensions().get(8));
+    http.internalInit(descriptor.getExtensions().get(9));
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.AnnotationsProto.resource);
+    com.google.protobuf.Descriptors.FileDescriptor
+        .internalUpdateFileDescriptor(descriptor, registry);
     com.google.api.HttpProto.getDescriptor();
+    com.google.api.MetadataProto.getDescriptor();
+    com.google.api.ResourcesProto.getDescriptor();
+    com.google.api.RetryProto.getDescriptor();
+    com.google.api.SignatureProto.getDescriptor();
     com.google.protobuf.DescriptorProtos.getDescriptor();
   }
 
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java
index bc4787466..38782682d 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java
@@ -48,23 +48,23 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025google/api/auth.proto\022\ngoogle.api\032\034goo" +
-      "gle/api/annotations.proto\"l\n\016Authenticat" +
-      "ion\022-\n\005rules\030\003 \003(\0132\036.google.api.Authenti" +
-      "cationRule\022+\n\tproviders\030\004 \003(\0132\030.google.a" +
-      "pi.AuthProvider\"\251\001\n\022AuthenticationRule\022\020" +
-      "\n\010selector\030\001 \001(\t\022,\n\005oauth\030\002 \001(\0132\035.google" +
-      ".api.OAuthRequirements\022 \n\030allow_without_" +
-      "credential\030\005 \001(\010\0221\n\014requirements\030\007 \003(\0132\033" +
-      ".google.api.AuthRequirement\"j\n\014AuthProvi" +
-      "der\022\n\n\002id\030\001 \001(\t\022\016\n\006issuer\030\002 \001(\t\022\020\n\010jwks_" +
-      "uri\030\003 \001(\t\022\021\n\taudiences\030\004 \001(\t\022\031\n\021authoriz" +
-      "ation_url\030\005 \001(\t\"-\n\021OAuthRequirements\022\030\n\020" +
-      "canonical_scopes\030\001 \001(\t\"9\n\017AuthRequiremen" +
-      "t\022\023\n\013provider_id\030\001 \001(\t\022\021\n\taudiences\030\002 \001(" +
-      "\tBk\n\016com.google.apiB\tAuthProtoP\001ZEgoogle" +
-      ".golang.org/genproto/googleapis/api/serv" +
-      "iceconfig;serviceconfig\242\002\004GAPIb\006proto3"
+      "\n\025google/api/auth.proto\022\ngoogle.api\"l\n\016A" +
+      "uthentication\022-\n\005rules\030\003 \003(\0132\036.google.ap" +
+      "i.AuthenticationRule\022+\n\tproviders\030\004 \003(\0132" +
+      "\030.google.api.AuthProvider\"\251\001\n\022Authentica" +
+      "tionRule\022\020\n\010selector\030\001 \001(\t\022,\n\005oauth\030\002 \001(" +
+      "\0132\035.google.api.OAuthRequirements\022 \n\030allo" +
+      "w_without_credential\030\005 \001(\010\0221\n\014requiremen" +
+      "ts\030\007 \003(\0132\033.google.api.AuthRequirement\"j\n" +
+      "\014AuthProvider\022\n\n\002id\030\001 \001(\t\022\016\n\006issuer\030\002 \001(" +
+      "\t\022\020\n\010jwks_uri\030\003 \001(\t\022\021\n\taudiences\030\004 \001(\t\022\031" +
+      "\n\021authorization_url\030\005 \001(\t\"-\n\021OAuthRequir" +
+      "ements\022\030\n\020canonical_scopes\030\001 \001(\t\"9\n\017Auth" +
+      "Requirement\022\023\n\013provider_id\030\001 \001(\t\022\021\n\taudi" +
+      "ences\030\002 \001(\tBk\n\016com.google.apiB\tAuthProto" +
+      "P\001ZEgoogle.golang.org/genproto/googleapi" +
+      "s/api/serviceconfig;serviceconfig\242\002\004GAPI" +
+      "b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -77,7 +77,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          com.google.api.AnnotationsProto.getDescriptor(),
         }, assigner);
     internal_static_google_api_Authentication_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -109,7 +108,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_api_AuthRequirement_descriptor,
         new java.lang.String[] { "ProviderId", "Audiences", });
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
index 5ddcff058..b4514ee17 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
@@ -52,13 +52,6 @@ private AuthProvider(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -89,6 +82,13 @@ private AuthProvider(
             authorizationUrl_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -106,6 +106,7 @@ private AuthProvider(
     return com.google.api.AuthProto.internal_static_google_api_AuthProvider_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.AuthProto.internal_static_google_api_AuthProvider_fieldAccessorTable
@@ -372,6 +373,7 @@ public java.lang.String getAuthorizationUrl() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -381,6 +383,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getIdBytes().isEmpty()) {
@@ -401,6 +404,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -543,6 +547,7 @@ public static com.google.api.AuthProvider parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -550,6 +555,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.AuthProvider prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -578,6 +584,7 @@ public static final class Builder extends
       return com.google.api.AuthProto.internal_static_google_api_AuthProvider_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.AuthProto.internal_static_google_api_AuthProvider_fieldAccessorTable
@@ -600,6 +607,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = "";
@@ -615,15 +623,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.AuthProto.internal_static_google_api_AuthProvider_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.AuthProvider getDefaultInstanceForType() {
       return com.google.api.AuthProvider.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.AuthProvider build() {
       com.google.api.AuthProvider result = buildPartial();
       if (!result.isInitialized()) {
@@ -632,6 +643,7 @@ public com.google.api.AuthProvider build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.AuthProvider buildPartial() {
       com.google.api.AuthProvider result = new com.google.api.AuthProvider(this);
       result.id_ = id_;
@@ -643,32 +655,39 @@ public com.google.api.AuthProvider buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.AuthProvider) {
         return mergeFrom((com.google.api.AuthProvider)other);
@@ -705,10 +724,12 @@ public Builder mergeFrom(com.google.api.AuthProvider other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1291,11 +1312,13 @@ public Builder setAuthorizationUrlBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1317,6 +1340,7 @@ public static com.google.api.AuthProvider getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<AuthProvider>
       PARSER = new com.google.protobuf.AbstractParser<AuthProvider>() {
+    @java.lang.Override
     public AuthProvider parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1334,6 +1358,7 @@ public com.google.protobuf.Parser<AuthProvider> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.AuthProvider getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
index 488029751..1017f8eb5 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
@@ -49,13 +49,6 @@ private AuthRequirement(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,6 +61,13 @@ private AuthRequirement(
             audiences_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,6 +85,7 @@ private AuthRequirement(
     return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_fieldAccessorTable
@@ -205,6 +206,7 @@ public java.lang.String getAudiences() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,6 +216,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProviderIdBytes().isEmpty()) {
@@ -225,6 +228,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,6 +350,7 @@ public static com.google.api.AuthRequirement parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,6 +358,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.AuthRequirement prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,6 +387,7 @@ public static final class Builder extends
       return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_fieldAccessorTable
@@ -403,6 +410,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       providerId_ = "";
@@ -412,15 +420,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.AuthRequirement getDefaultInstanceForType() {
       return com.google.api.AuthRequirement.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.AuthRequirement build() {
       com.google.api.AuthRequirement result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,6 +440,7 @@ public com.google.api.AuthRequirement build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.AuthRequirement buildPartial() {
       com.google.api.AuthRequirement result = new com.google.api.AuthRequirement(this);
       result.providerId_ = providerId_;
@@ -437,32 +449,39 @@ public com.google.api.AuthRequirement buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.AuthRequirement) {
         return mergeFrom((com.google.api.AuthRequirement)other);
@@ -487,10 +506,12 @@ public Builder mergeFrom(com.google.api.AuthRequirement other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -756,11 +777,13 @@ public Builder setAudiencesBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -782,6 +805,7 @@ public static com.google.api.AuthRequirement getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<AuthRequirement>
       PARSER = new com.google.protobuf.AbstractParser<AuthRequirement>() {
+    @java.lang.Override
     public AuthRequirement parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -799,6 +823,7 @@ public com.google.protobuf.Parser<AuthRequirement> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.AuthRequirement getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Authentication.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
index 6a1456b56..78f1e1c6f 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
@@ -59,13 +59,6 @@ private Authentication(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 26: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               rules_ = new java.util.ArrayList<com.google.api.AuthenticationRule>();
@@ -84,6 +77,13 @@ private Authentication(
                 input.readMessage(com.google.api.AuthProvider.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -107,6 +107,7 @@ private Authentication(
     return com.google.api.AuthProto.internal_static_google_api_Authentication_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.AuthProto.internal_static_google_api_Authentication_fieldAccessorTable
@@ -230,6 +231,7 @@ public com.google.api.AuthProviderOrBuilder getProvidersOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -239,6 +241,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < rules_.size(); i++) {
@@ -250,6 +253,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -377,6 +381,7 @@ public static com.google.api.Authentication parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -384,6 +389,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Authentication prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,6 +428,7 @@ public static final class Builder extends
       return com.google.api.AuthProto.internal_static_google_api_Authentication_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.AuthProto.internal_static_google_api_Authentication_fieldAccessorTable
@@ -446,6 +453,7 @@ private void maybeForceBuilderInitialization() {
         getProvidersFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
@@ -463,15 +471,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.AuthProto.internal_static_google_api_Authentication_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Authentication getDefaultInstanceForType() {
       return com.google.api.Authentication.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Authentication build() {
       com.google.api.Authentication result = buildPartial();
       if (!result.isInitialized()) {
@@ -480,6 +491,7 @@ public com.google.api.Authentication build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Authentication buildPartial() {
       com.google.api.Authentication result = new com.google.api.Authentication(this);
       int from_bitField0_ = bitField0_;
@@ -505,32 +517,39 @@ public com.google.api.Authentication buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Authentication) {
         return mergeFrom((com.google.api.Authentication)other);
@@ -599,10 +618,12 @@ public Builder mergeFrom(com.google.api.Authentication other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1263,11 +1284,13 @@ public com.google.api.AuthProvider.Builder addProvidersBuilder(
       }
       return providersBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1289,6 +1312,7 @@ public static com.google.api.Authentication getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Authentication>
       PARSER = new com.google.protobuf.AbstractParser<Authentication>() {
+    @java.lang.Override
     public Authentication parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1306,6 +1330,7 @@ public com.google.protobuf.Parser<Authentication> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Authentication getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
index f63396054..456969704 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
@@ -55,13 +55,6 @@ private AuthenticationRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -95,6 +88,13 @@ private AuthenticationRule(
                 input.readMessage(com.google.api.AuthRequirement.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,6 +115,7 @@ private AuthenticationRule(
     return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_fieldAccessorTable
@@ -269,6 +270,7 @@ public com.google.api.AuthRequirementOrBuilder getRequirementsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -278,6 +280,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -295,6 +298,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -441,6 +445,7 @@ public static com.google.api.AuthenticationRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -448,6 +453,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.AuthenticationRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -481,6 +487,7 @@ public static final class Builder extends
       return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_fieldAccessorTable
@@ -504,6 +511,7 @@ private void maybeForceBuilderInitialization() {
         getRequirementsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -525,15 +533,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.AuthenticationRule getDefaultInstanceForType() {
       return com.google.api.AuthenticationRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.AuthenticationRule build() {
       com.google.api.AuthenticationRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -542,6 +553,7 @@ public com.google.api.AuthenticationRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.AuthenticationRule buildPartial() {
       com.google.api.AuthenticationRule result = new com.google.api.AuthenticationRule(this);
       int from_bitField0_ = bitField0_;
@@ -567,32 +579,39 @@ public com.google.api.AuthenticationRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.AuthenticationRule) {
         return mergeFrom((com.google.api.AuthenticationRule)other);
@@ -645,10 +664,12 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1264,11 +1285,13 @@ public com.google.api.AuthRequirement.Builder addRequirementsBuilder(
       }
       return requirementsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1290,6 +1313,7 @@ public static com.google.api.AuthenticationRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<AuthenticationRule>
       PARSER = new com.google.protobuf.AbstractParser<AuthenticationRule>() {
+    @java.lang.Override
     public AuthenticationRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1307,6 +1331,7 @@ public com.google.protobuf.Parser<AuthenticationRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.AuthenticationRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Backend.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Backend.java
index d5aeef090..3fe8b5eec 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Backend.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Backend.java
@@ -47,13 +47,6 @@ private Backend(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               rules_ = new java.util.ArrayList<com.google.api.BackendRule>();
@@ -63,6 +56,13 @@ private Backend(
                 input.readMessage(com.google.api.BackendRule.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,6 +83,7 @@ private Backend(
     return com.google.api.BackendProto.internal_static_google_api_Backend_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.BackendProto.internal_static_google_api_Backend_fieldAccessorTable
@@ -151,6 +152,7 @@ public com.google.api.BackendRuleOrBuilder getRulesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -160,6 +162,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < rules_.size(); i++) {
@@ -168,6 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -285,6 +289,7 @@ public static com.google.api.Backend parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,6 +297,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Backend prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -319,6 +325,7 @@ public static final class Builder extends
       return com.google.api.BackendProto.internal_static_google_api_Backend_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.BackendProto.internal_static_google_api_Backend_fieldAccessorTable
@@ -342,6 +349,7 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
@@ -353,15 +361,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.BackendProto.internal_static_google_api_Backend_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Backend getDefaultInstanceForType() {
       return com.google.api.Backend.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Backend build() {
       com.google.api.Backend result = buildPartial();
       if (!result.isInitialized()) {
@@ -370,6 +381,7 @@ public com.google.api.Backend build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Backend buildPartial() {
       com.google.api.Backend result = new com.google.api.Backend(this);
       int from_bitField0_ = bitField0_;
@@ -386,32 +398,39 @@ public com.google.api.Backend buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Backend) {
         return mergeFrom((com.google.api.Backend)other);
@@ -454,10 +473,12 @@ public Builder mergeFrom(com.google.api.Backend other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,11 +827,13 @@ public com.google.api.BackendRule.Builder addRulesBuilder(
       }
       return rulesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,6 +855,7 @@ public static com.google.api.Backend getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Backend>
       PARSER = new com.google.protobuf.AbstractParser<Backend>() {
+    @java.lang.Override
     public Backend parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,6 +873,7 @@ public com.google.protobuf.Parser<Backend> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Backend getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
index cea0de0b5..b84b843d9 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
@@ -50,13 +50,6 @@ private BackendRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,6 +72,13 @@ private BackendRule(
             minDeadline_ = input.readDouble();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,6 +96,7 @@ private BackendRule(
     return com.google.api.BackendProto.internal_static_google_api_BackendRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.BackendProto.internal_static_google_api_BackendRule_fieldAccessorTable
@@ -218,6 +219,7 @@ public double getMinDeadline() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,6 +229,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -244,6 +247,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,6 +391,7 @@ public static com.google.api.BackendRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,6 +399,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.BackendRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -421,6 +427,7 @@ public static final class Builder extends
       return com.google.api.BackendProto.internal_static_google_api_BackendRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.BackendProto.internal_static_google_api_BackendRule_fieldAccessorTable
@@ -443,6 +450,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -456,15 +464,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.BackendProto.internal_static_google_api_BackendRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.BackendRule getDefaultInstanceForType() {
       return com.google.api.BackendRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.BackendRule build() {
       com.google.api.BackendRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,6 +484,7 @@ public com.google.api.BackendRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.BackendRule buildPartial() {
       com.google.api.BackendRule result = new com.google.api.BackendRule(this);
       result.selector_ = selector_;
@@ -483,32 +495,39 @@ public com.google.api.BackendRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.BackendRule) {
         return mergeFrom((com.google.api.BackendRule)other);
@@ -539,10 +558,12 @@ public Builder mergeFrom(com.google.api.BackendRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,11 +846,13 @@ public Builder clearMinDeadline() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -851,6 +874,7 @@ public static com.google.api.BackendRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<BackendRule>
       PARSER = new com.google.protobuf.AbstractParser<BackendRule>() {
+    @java.lang.Override
     public BackendRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -868,6 +892,7 @@ public com.google.protobuf.Parser<BackendRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.BackendRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Billing.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Billing.java
index b4837e601..87a7165b5 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Billing.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Billing.java
@@ -65,13 +65,6 @@ private Billing(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 66: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               consumerDestinations_ = new java.util.ArrayList<com.google.api.Billing.BillingDestination>();
@@ -81,6 +74,13 @@ private Billing(
                 input.readMessage(com.google.api.Billing.BillingDestination.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -101,6 +101,7 @@ private Billing(
     return com.google.api.BillingProto.internal_static_google_api_Billing_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.BillingProto.internal_static_google_api_Billing_fieldAccessorTable
@@ -217,13 +218,6 @@ private BillingDestination(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -239,6 +233,13 @@ private BillingDestination(
               metrics_.add(s);
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -259,6 +260,7 @@ private BillingDestination(
       return com.google.api.BillingProto.internal_static_google_api_Billing_BillingDestination_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.BillingProto.internal_static_google_api_Billing_BillingDestination_fieldAccessorTable
@@ -361,6 +363,7 @@ public java.lang.String getMetrics(int index) {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -370,6 +373,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getMonitoredResourceBytes().isEmpty()) {
@@ -381,6 +385,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -509,6 +514,7 @@ public static com.google.api.Billing.BillingDestination parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -516,6 +522,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.api.Billing.BillingDestination prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -544,6 +551,7 @@ public static final class Builder extends
         return com.google.api.BillingProto.internal_static_google_api_Billing_BillingDestination_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.BillingProto.internal_static_google_api_Billing_BillingDestination_fieldAccessorTable
@@ -566,6 +574,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         monitoredResource_ = "";
@@ -575,15 +584,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.api.BillingProto.internal_static_google_api_Billing_BillingDestination_descriptor;
       }
 
+      @java.lang.Override
       public com.google.api.Billing.BillingDestination getDefaultInstanceForType() {
         return com.google.api.Billing.BillingDestination.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.api.Billing.BillingDestination build() {
         com.google.api.Billing.BillingDestination result = buildPartial();
         if (!result.isInitialized()) {
@@ -592,6 +604,7 @@ public com.google.api.Billing.BillingDestination build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.api.Billing.BillingDestination buildPartial() {
         com.google.api.Billing.BillingDestination result = new com.google.api.Billing.BillingDestination(this);
         int from_bitField0_ = bitField0_;
@@ -607,32 +620,39 @@ public com.google.api.Billing.BillingDestination buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Billing.BillingDestination) {
           return mergeFrom((com.google.api.Billing.BillingDestination)other);
@@ -663,10 +683,12 @@ public Builder mergeFrom(com.google.api.Billing.BillingDestination other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -918,11 +940,13 @@ public Builder addMetricsBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -944,6 +968,7 @@ public static com.google.api.Billing.BillingDestination getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<BillingDestination>
         PARSER = new com.google.protobuf.AbstractParser<BillingDestination>() {
+      @java.lang.Override
       public BillingDestination parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -961,6 +986,7 @@ public com.google.protobuf.Parser<BillingDestination> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.api.Billing.BillingDestination getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1038,6 +1064,7 @@ public com.google.api.Billing.BillingDestinationOrBuilder getConsumerDestination
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1047,6 +1074,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < consumerDestinations_.size(); i++) {
@@ -1055,6 +1083,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1172,6 +1201,7 @@ public static com.google.api.Billing parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1179,6 +1209,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Billing prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1224,6 +1255,7 @@ public static final class Builder extends
       return com.google.api.BillingProto.internal_static_google_api_Billing_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.BillingProto.internal_static_google_api_Billing_fieldAccessorTable
@@ -1247,6 +1279,7 @@ private void maybeForceBuilderInitialization() {
         getConsumerDestinationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (consumerDestinationsBuilder_ == null) {
@@ -1258,15 +1291,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.BillingProto.internal_static_google_api_Billing_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Billing getDefaultInstanceForType() {
       return com.google.api.Billing.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Billing build() {
       com.google.api.Billing result = buildPartial();
       if (!result.isInitialized()) {
@@ -1275,6 +1311,7 @@ public com.google.api.Billing build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Billing buildPartial() {
       com.google.api.Billing result = new com.google.api.Billing(this);
       int from_bitField0_ = bitField0_;
@@ -1291,32 +1328,39 @@ public com.google.api.Billing buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Billing) {
         return mergeFrom((com.google.api.Billing)other);
@@ -1359,10 +1403,12 @@ public Builder mergeFrom(com.google.api.Billing other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1747,11 +1793,13 @@ public com.google.api.Billing.BillingDestination.Builder addConsumerDestinations
       }
       return consumerDestinationsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1773,6 +1821,7 @@ public static com.google.api.Billing getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Billing>
       PARSER = new com.google.protobuf.AbstractParser<Billing>() {
+    @java.lang.Override
     public Billing parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1790,6 +1839,7 @@ public com.google.protobuf.Parser<Billing> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Billing getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java
index 50b60dc75..dac7df6cb 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java
@@ -34,15 +34,14 @@ public static void registerAllExtensions(
   static {
     java.lang.String[] descriptorData = {
       "\n\030google/api/billing.proto\022\ngoogle.api\032\034" +
-      "google/api/annotations.proto\032\027google/api" +
-      "/metric.proto\"\223\001\n\007Billing\022E\n\025consumer_de" +
-      "stinations\030\010 \003(\0132&.google.api.Billing.Bi" +
-      "llingDestination\032A\n\022BillingDestination\022\032" +
-      "\n\022monitored_resource\030\001 \001(\t\022\017\n\007metrics\030\002 " +
-      "\003(\tBn\n\016com.google.apiB\014BillingProtoP\001ZEg" +
-      "oogle.golang.org/genproto/googleapis/api" +
-      "/serviceconfig;serviceconfig\242\002\004GAPIb\006pro" +
-      "to3"
+      "google/api/annotations.proto\"\223\001\n\007Billing" +
+      "\022E\n\025consumer_destinations\030\010 \003(\0132&.google" +
+      ".api.Billing.BillingDestination\032A\n\022Billi" +
+      "ngDestination\022\032\n\022monitored_resource\030\001 \001(" +
+      "\t\022\017\n\007metrics\030\002 \003(\tBn\n\016com.google.apiB\014Bi" +
+      "llingProtoP\001ZEgoogle.golang.org/genproto" +
+      "/googleapis/api/serviceconfig;servicecon" +
+      "fig\242\002\004GAPIb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -56,7 +55,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.api.MetricProto.getDescriptor(),
         }, assigner);
     internal_static_google_api_Billing_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -71,7 +69,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
         internal_static_google_api_Billing_BillingDestination_descriptor,
         new java.lang.String[] { "MonitoredResource", "Metrics", });
     com.google.api.AnnotationsProto.getDescriptor();
-    com.google.api.MetricProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
index 9ba730a9e..3f63e9274 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
@@ -55,13 +55,6 @@ private ConfigChange(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -95,6 +88,13 @@ private ConfigChange(
                 input.readMessage(com.google.api.Advice.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,6 +115,7 @@ private ConfigChange(
     return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_fieldAccessorTable
@@ -289,6 +290,7 @@ public int getChangeTypeValue() {
    * <code>.google.api.ChangeType change_type = 4;</code>
    */
   public com.google.api.ChangeType getChangeType() {
+    @SuppressWarnings("deprecation")
     com.google.api.ChangeType result = com.google.api.ChangeType.valueOf(changeType_);
     return result == null ? com.google.api.ChangeType.UNRECOGNIZED : result;
   }
@@ -354,6 +356,7 @@ public com.google.api.AdviceOrBuilder getAdvicesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -363,6 +366,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getElementBytes().isEmpty()) {
@@ -383,6 +387,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -528,6 +533,7 @@ public static com.google.api.ConfigChange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -535,6 +541,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.ConfigChange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -566,6 +573,7 @@ public static final class Builder extends
       return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_fieldAccessorTable
@@ -589,6 +597,7 @@ private void maybeForceBuilderInitialization() {
         getAdvicesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       element_ = "";
@@ -608,15 +617,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.ConfigChange getDefaultInstanceForType() {
       return com.google.api.ConfigChange.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.ConfigChange build() {
       com.google.api.ConfigChange result = buildPartial();
       if (!result.isInitialized()) {
@@ -625,6 +637,7 @@ public com.google.api.ConfigChange build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.ConfigChange buildPartial() {
       com.google.api.ConfigChange result = new com.google.api.ConfigChange(this);
       int from_bitField0_ = bitField0_;
@@ -647,32 +660,39 @@ public com.google.api.ConfigChange buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ConfigChange) {
         return mergeFrom((com.google.api.ConfigChange)other);
@@ -730,10 +750,12 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1101,6 +1123,7 @@ public Builder setChangeTypeValue(int value) {
      * <code>.google.api.ChangeType change_type = 4;</code>
      */
     public com.google.api.ChangeType getChangeType() {
+      @SuppressWarnings("deprecation")
       com.google.api.ChangeType result = com.google.api.ChangeType.valueOf(changeType_);
       return result == null ? com.google.api.ChangeType.UNRECOGNIZED : result;
     }
@@ -1463,11 +1486,13 @@ public com.google.api.Advice.Builder addAdvicesBuilder(
       }
       return advicesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1489,6 +1514,7 @@ public static com.google.api.ConfigChange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<ConfigChange>
       PARSER = new com.google.protobuf.AbstractParser<ConfigChange>() {
+    @java.lang.Override
     public ConfigChange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1506,6 +1532,7 @@ public com.google.protobuf.Parser<ConfigChange> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.ConfigChange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Context.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Context.java
index d1b401308..ea52f506d 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Context.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Context.java
@@ -59,13 +59,6 @@ private Context(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               rules_ = new java.util.ArrayList<com.google.api.ContextRule>();
@@ -75,6 +68,13 @@ private Context(
                 input.readMessage(com.google.api.ContextRule.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,6 +95,7 @@ private Context(
     return com.google.api.ContextProto.internal_static_google_api_Context_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ContextProto.internal_static_google_api_Context_fieldAccessorTable
@@ -163,6 +164,7 @@ public com.google.api.ContextRuleOrBuilder getRulesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -172,6 +174,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < rules_.size(); i++) {
@@ -180,6 +183,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -297,6 +301,7 @@ public static com.google.api.Context parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -304,6 +309,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Context prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,6 +349,7 @@ public static final class Builder extends
       return com.google.api.ContextProto.internal_static_google_api_Context_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ContextProto.internal_static_google_api_Context_fieldAccessorTable
@@ -366,6 +373,7 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
@@ -377,15 +385,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ContextProto.internal_static_google_api_Context_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Context getDefaultInstanceForType() {
       return com.google.api.Context.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Context build() {
       com.google.api.Context result = buildPartial();
       if (!result.isInitialized()) {
@@ -394,6 +405,7 @@ public com.google.api.Context build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Context buildPartial() {
       com.google.api.Context result = new com.google.api.Context(this);
       int from_bitField0_ = bitField0_;
@@ -410,32 +422,39 @@ public com.google.api.Context buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Context) {
         return mergeFrom((com.google.api.Context)other);
@@ -478,10 +497,12 @@ public Builder mergeFrom(com.google.api.Context other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -830,11 +851,13 @@ public com.google.api.ContextRule.Builder addRulesBuilder(
       }
       return rulesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -856,6 +879,7 @@ public static com.google.api.Context getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Context>
       PARSER = new com.google.protobuf.AbstractParser<Context>() {
+    @java.lang.Override
     public Context parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -873,6 +897,7 @@ public com.google.protobuf.Parser<Context> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Context getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
index 90a2b7ff2..7488a5c28 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
@@ -50,13 +50,6 @@ private ContextRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -81,6 +74,13 @@ private ContextRule(
             provided_.add(s);
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,6 +104,7 @@ private ContextRule(
     return com.google.api.ContextProto.internal_static_google_api_ContextRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ContextProto.internal_static_google_api_ContextRule_fieldAccessorTable
@@ -247,6 +248,7 @@ public java.lang.String getProvided(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -256,6 +258,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -270,6 +273,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -412,6 +416,7 @@ public static com.google.api.ContextRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -419,6 +424,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.ContextRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -447,6 +453,7 @@ public static final class Builder extends
       return com.google.api.ContextProto.internal_static_google_api_ContextRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ContextProto.internal_static_google_api_ContextRule_fieldAccessorTable
@@ -469,6 +476,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -480,15 +488,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ContextProto.internal_static_google_api_ContextRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.ContextRule getDefaultInstanceForType() {
       return com.google.api.ContextRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.ContextRule build() {
       com.google.api.ContextRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -497,6 +508,7 @@ public com.google.api.ContextRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.ContextRule buildPartial() {
       com.google.api.ContextRule result = new com.google.api.ContextRule(this);
       int from_bitField0_ = bitField0_;
@@ -517,32 +529,39 @@ public com.google.api.ContextRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ContextRule) {
         return mergeFrom((com.google.api.ContextRule)other);
@@ -583,10 +602,12 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -959,11 +980,13 @@ public Builder addProvidedBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -985,6 +1008,7 @@ public static com.google.api.ContextRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<ContextRule>
       PARSER = new com.google.protobuf.AbstractParser<ContextRule>() {
+    @java.lang.Override
     public ContextRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1002,6 +1026,7 @@ public com.google.protobuf.Parser<ContextRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.ContextRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Control.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Control.java
index 3c3149539..0950437cf 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Control.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Control.java
@@ -49,6 +49,12 @@ private Control(
           case 0:
             done = true;
             break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            environment_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -56,12 +62,6 @@ private Control(
             }
             break;
           }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            environment_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -79,6 +79,7 @@ private Control(
     return com.google.api.ControlProto.internal_static_google_api_Control_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ControlProto.internal_static_google_api_Control_fieldAccessorTable
@@ -131,6 +132,7 @@ public java.lang.String getEnvironment() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,6 +142,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getEnvironmentBytes().isEmpty()) {
@@ -148,6 +151,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,6 +266,7 @@ public static com.google.api.Control parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -269,6 +274,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Control prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,6 +304,7 @@ public static final class Builder extends
       return com.google.api.ControlProto.internal_static_google_api_Control_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ControlProto.internal_static_google_api_Control_fieldAccessorTable
@@ -320,6 +327,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       environment_ = "";
@@ -327,15 +335,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ControlProto.internal_static_google_api_Control_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Control getDefaultInstanceForType() {
       return com.google.api.Control.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Control build() {
       com.google.api.Control result = buildPartial();
       if (!result.isInitialized()) {
@@ -344,6 +355,7 @@ public com.google.api.Control build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Control buildPartial() {
       com.google.api.Control result = new com.google.api.Control(this);
       result.environment_ = environment_;
@@ -351,32 +363,39 @@ public com.google.api.Control buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Control) {
         return mergeFrom((com.google.api.Control)other);
@@ -397,10 +416,12 @@ public Builder mergeFrom(com.google.api.Control other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -512,11 +533,13 @@ public Builder setEnvironmentBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -538,6 +561,7 @@ public static com.google.api.Control getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Control>
       PARSER = new com.google.protobuf.AbstractParser<Control>() {
+    @java.lang.Override
     public Control parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -555,6 +579,7 @@ public com.google.protobuf.Parser<Control> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Control getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
index d2714321d..7e96da8ad 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
@@ -48,13 +48,6 @@ private CustomHttpPattern(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,6 +60,13 @@ private CustomHttpPattern(
             path_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,6 +84,7 @@ private CustomHttpPattern(
     return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_fieldAccessorTable
@@ -176,6 +177,7 @@ public java.lang.String getPath() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -185,6 +187,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getKindBytes().isEmpty()) {
@@ -196,6 +199,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -317,6 +321,7 @@ public static com.google.api.CustomHttpPattern parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -324,6 +329,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.CustomHttpPattern prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -351,6 +357,7 @@ public static final class Builder extends
       return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_fieldAccessorTable
@@ -373,6 +380,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       kind_ = "";
@@ -382,15 +390,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.CustomHttpPattern getDefaultInstanceForType() {
       return com.google.api.CustomHttpPattern.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.CustomHttpPattern build() {
       com.google.api.CustomHttpPattern result = buildPartial();
       if (!result.isInitialized()) {
@@ -399,6 +410,7 @@ public com.google.api.CustomHttpPattern build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.CustomHttpPattern buildPartial() {
       com.google.api.CustomHttpPattern result = new com.google.api.CustomHttpPattern(this);
       result.kind_ = kind_;
@@ -407,32 +419,39 @@ public com.google.api.CustomHttpPattern buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.CustomHttpPattern) {
         return mergeFrom((com.google.api.CustomHttpPattern)other);
@@ -457,10 +476,12 @@ public Builder mergeFrom(com.google.api.CustomHttpPattern other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -656,11 +677,13 @@ public Builder setPathBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -682,6 +705,7 @@ public static com.google.api.CustomHttpPattern getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<CustomHttpPattern>
       PARSER = new com.google.protobuf.AbstractParser<CustomHttpPattern>() {
+    @java.lang.Override
     public CustomHttpPattern parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -699,6 +723,7 @@ public com.google.protobuf.Parser<CustomHttpPattern> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.CustomHttpPattern getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Distribution.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
index 6be4f5aca..350494105 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
@@ -61,13 +61,6 @@ private Distribution(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             count_ = input.readInt64();
@@ -130,6 +123,13 @@ private Distribution(
             input.popLimit(limit);
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -150,6 +150,7 @@ private Distribution(
     return com.google.api.DistributionProto.internal_static_google_api_Distribution_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.DistributionProto.internal_static_google_api_Distribution_fieldAccessorTable
@@ -224,13 +225,6 @@ private Range(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 9: {
 
               min_ = input.readDouble();
@@ -241,6 +235,13 @@ private Range(
               max_ = input.readDouble();
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -258,6 +259,7 @@ private Range(
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_Range_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_Range_fieldAccessorTable
@@ -292,6 +294,7 @@ public double getMax() {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -301,6 +304,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (min_ != 0D) {
@@ -312,6 +316,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -441,6 +446,7 @@ public static com.google.api.Distribution.Range parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -448,6 +454,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.api.Distribution.Range prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -475,6 +482,7 @@ public static final class Builder extends
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_Range_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_Range_fieldAccessorTable
@@ -497,6 +505,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         min_ = 0D;
@@ -506,15 +515,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_Range_descriptor;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.Range getDefaultInstanceForType() {
         return com.google.api.Distribution.Range.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.Range build() {
         com.google.api.Distribution.Range result = buildPartial();
         if (!result.isInitialized()) {
@@ -523,6 +535,7 @@ public com.google.api.Distribution.Range build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.Range buildPartial() {
         com.google.api.Distribution.Range result = new com.google.api.Distribution.Range(this);
         result.min_ = min_;
@@ -531,32 +544,39 @@ public com.google.api.Distribution.Range buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Distribution.Range) {
           return mergeFrom((com.google.api.Distribution.Range)other);
@@ -579,10 +599,12 @@ public Builder mergeFrom(com.google.api.Distribution.Range other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,11 +698,13 @@ public Builder clearMax() {
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -702,6 +726,7 @@ public static com.google.api.Distribution.Range getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<Range>
         PARSER = new com.google.protobuf.AbstractParser<Range>() {
+      @java.lang.Override
       public Range parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -719,6 +744,7 @@ public com.google.protobuf.Parser<Range> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.api.Distribution.Range getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -867,13 +893,6 @@ private BucketOptions(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               com.google.api.Distribution.BucketOptions.Linear.Builder subBuilder = null;
               if (optionsCase_ == 1) {
@@ -916,6 +935,13 @@ private BucketOptions(
               optionsCase_ = 3;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -933,6 +959,7 @@ private BucketOptions(
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_fieldAccessorTable
@@ -1023,13 +1050,6 @@ private Linear(
               case 0:
                 done = true;
                 break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
               case 8: {
 
                 numFiniteBuckets_ = input.readInt32();
@@ -1045,6 +1065,13 @@ private Linear(
                 offset_ = input.readDouble();
                 break;
               }
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1062,6 +1089,7 @@ private Linear(
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Linear_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Linear_fieldAccessorTable
@@ -1109,6 +1137,7 @@ public double getOffset() {
       }
 
       private byte memoizedIsInitialized = -1;
+      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1118,6 +1147,7 @@ public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (numFiniteBuckets_ != 0) {
@@ -1132,6 +1162,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
+      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1269,6 +1300,7 @@ public static com.google.api.Distribution.BucketOptions.Linear parseFrom(
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
+      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1276,6 +1308,7 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.api.Distribution.BucketOptions.Linear prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
+      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1309,6 +1342,7 @@ public static final class Builder extends
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Linear_descriptor;
         }
 
+        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Linear_fieldAccessorTable
@@ -1331,6 +1365,7 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
+        @java.lang.Override
         public Builder clear() {
           super.clear();
           numFiniteBuckets_ = 0;
@@ -1342,15 +1377,18 @@ public Builder clear() {
           return this;
         }
 
+        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Linear_descriptor;
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Linear getDefaultInstanceForType() {
           return com.google.api.Distribution.BucketOptions.Linear.getDefaultInstance();
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Linear build() {
           com.google.api.Distribution.BucketOptions.Linear result = buildPartial();
           if (!result.isInitialized()) {
@@ -1359,6 +1397,7 @@ public com.google.api.Distribution.BucketOptions.Linear build() {
           return result;
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Linear buildPartial() {
           com.google.api.Distribution.BucketOptions.Linear result = new com.google.api.Distribution.BucketOptions.Linear(this);
           result.numFiniteBuckets_ = numFiniteBuckets_;
@@ -1368,32 +1407,39 @@ public com.google.api.Distribution.BucketOptions.Linear buildPartial() {
           return result;
         }
 
+        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
+        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
+        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
+        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
+        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
+        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
+        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.api.Distribution.BucketOptions.Linear) {
             return mergeFrom((com.google.api.Distribution.BucketOptions.Linear)other);
@@ -1419,10 +1465,12 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Linear other)
           return this;
         }
 
+        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
+        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1554,11 +1602,13 @@ public Builder clearOffset() {
           onChanged();
           return this;
         }
+        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
+        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -1580,6 +1630,7 @@ public static com.google.api.Distribution.BucketOptions.Linear getDefaultInstanc
 
       private static final com.google.protobuf.Parser<Linear>
           PARSER = new com.google.protobuf.AbstractParser<Linear>() {
+        @java.lang.Override
         public Linear parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1597,6 +1648,7 @@ public com.google.protobuf.Parser<Linear> getParserForType() {
         return PARSER;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.BucketOptions.Linear getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -1686,13 +1738,6 @@ private Exponential(
               case 0:
                 done = true;
                 break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
               case 8: {
 
                 numFiniteBuckets_ = input.readInt32();
@@ -1708,6 +1753,13 @@ private Exponential(
                 scale_ = input.readDouble();
                 break;
               }
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1725,6 +1777,7 @@ private Exponential(
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Exponential_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Exponential_fieldAccessorTable
@@ -1772,6 +1825,7 @@ public double getScale() {
       }
 
       private byte memoizedIsInitialized = -1;
+      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1781,6 +1835,7 @@ public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (numFiniteBuckets_ != 0) {
@@ -1795,6 +1850,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
+      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1932,6 +1988,7 @@ public static com.google.api.Distribution.BucketOptions.Exponential parseFrom(
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
+      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1939,6 +1996,7 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.api.Distribution.BucketOptions.Exponential prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
+      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1972,6 +2030,7 @@ public static final class Builder extends
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Exponential_descriptor;
         }
 
+        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Exponential_fieldAccessorTable
@@ -1994,6 +2053,7 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
+        @java.lang.Override
         public Builder clear() {
           super.clear();
           numFiniteBuckets_ = 0;
@@ -2005,15 +2065,18 @@ public Builder clear() {
           return this;
         }
 
+        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Exponential_descriptor;
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Exponential getDefaultInstanceForType() {
           return com.google.api.Distribution.BucketOptions.Exponential.getDefaultInstance();
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Exponential build() {
           com.google.api.Distribution.BucketOptions.Exponential result = buildPartial();
           if (!result.isInitialized()) {
@@ -2022,6 +2085,7 @@ public com.google.api.Distribution.BucketOptions.Exponential build() {
           return result;
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Exponential buildPartial() {
           com.google.api.Distribution.BucketOptions.Exponential result = new com.google.api.Distribution.BucketOptions.Exponential(this);
           result.numFiniteBuckets_ = numFiniteBuckets_;
@@ -2031,32 +2095,39 @@ public com.google.api.Distribution.BucketOptions.Exponential buildPartial() {
           return result;
         }
 
+        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
+        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
+        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
+        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
+        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
+        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
+        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.api.Distribution.BucketOptions.Exponential) {
             return mergeFrom((com.google.api.Distribution.BucketOptions.Exponential)other);
@@ -2082,10 +2153,12 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Exponential o
           return this;
         }
 
+        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
+        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2217,11 +2290,13 @@ public Builder clearScale() {
           onChanged();
           return this;
         }
+        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
+        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -2243,6 +2318,7 @@ public static com.google.api.Distribution.BucketOptions.Exponential getDefaultIn
 
       private static final com.google.protobuf.Parser<Exponential>
           PARSER = new com.google.protobuf.AbstractParser<Exponential>() {
+        @java.lang.Override
         public Exponential parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2260,6 +2336,7 @@ public com.google.protobuf.Parser<Exponential> getParserForType() {
         return PARSER;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.BucketOptions.Exponential getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -2346,13 +2423,6 @@ private Explicit(
               case 0:
                 done = true;
                 break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
               case 9: {
                 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                   bounds_ = new java.util.ArrayList<java.lang.Double>();
@@ -2374,6 +2444,13 @@ private Explicit(
                 input.popLimit(limit);
                 break;
               }
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2394,6 +2471,7 @@ private Explicit(
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Explicit_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Explicit_fieldAccessorTable
@@ -2437,6 +2515,7 @@ public double getBounds(int index) {
       private int boundsMemoizedSerializedSize = -1;
 
       private byte memoizedIsInitialized = -1;
+      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -2446,6 +2525,7 @@ public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         getSerializedSize();
@@ -2459,6 +2539,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
+      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -2583,6 +2664,7 @@ public static com.google.api.Distribution.BucketOptions.Explicit parseFrom(
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
+      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -2590,6 +2672,7 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.api.Distribution.BucketOptions.Explicit prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
+      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -2624,6 +2707,7 @@ public static final class Builder extends
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Explicit_descriptor;
         }
 
+        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Explicit_fieldAccessorTable
@@ -2646,6 +2730,7 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
+        @java.lang.Override
         public Builder clear() {
           super.clear();
           bounds_ = java.util.Collections.emptyList();
@@ -2653,15 +2738,18 @@ public Builder clear() {
           return this;
         }
 
+        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_Explicit_descriptor;
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Explicit getDefaultInstanceForType() {
           return com.google.api.Distribution.BucketOptions.Explicit.getDefaultInstance();
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Explicit build() {
           com.google.api.Distribution.BucketOptions.Explicit result = buildPartial();
           if (!result.isInitialized()) {
@@ -2670,6 +2758,7 @@ public com.google.api.Distribution.BucketOptions.Explicit build() {
           return result;
         }
 
+        @java.lang.Override
         public com.google.api.Distribution.BucketOptions.Explicit buildPartial() {
           com.google.api.Distribution.BucketOptions.Explicit result = new com.google.api.Distribution.BucketOptions.Explicit(this);
           int from_bitField0_ = bitField0_;
@@ -2682,32 +2771,39 @@ public com.google.api.Distribution.BucketOptions.Explicit buildPartial() {
           return result;
         }
 
+        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
+        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
+        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
+        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
+        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
+        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
+        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.api.Distribution.BucketOptions.Explicit) {
             return mergeFrom((com.google.api.Distribution.BucketOptions.Explicit)other);
@@ -2734,10 +2830,12 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Explicit othe
           return this;
         }
 
+        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
+        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2850,11 +2948,13 @@ public Builder clearBounds() {
           onChanged();
           return this;
         }
+        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
+        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -2876,6 +2976,7 @@ public static com.google.api.Distribution.BucketOptions.Explicit getDefaultInsta
 
       private static final com.google.protobuf.Parser<Explicit>
           PARSER = new com.google.protobuf.AbstractParser<Explicit>() {
+        @java.lang.Override
         public Explicit parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2893,6 +2994,7 @@ public com.google.protobuf.Parser<Explicit> getParserForType() {
         return PARSER;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.BucketOptions.Explicit getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -3054,6 +3156,7 @@ public com.google.api.Distribution.BucketOptions.ExplicitOrBuilder getExplicitBu
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3063,6 +3166,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (optionsCase_ == 1) {
@@ -3077,6 +3181,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3231,6 +3336,7 @@ public static com.google.api.Distribution.BucketOptions parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3238,6 +3344,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.api.Distribution.BucketOptions prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3283,6 +3390,7 @@ public static final class Builder extends
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_fieldAccessorTable
@@ -3305,6 +3413,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         optionsCase_ = 0;
@@ -3312,15 +3421,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.api.DistributionProto.internal_static_google_api_Distribution_BucketOptions_descriptor;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.BucketOptions getDefaultInstanceForType() {
         return com.google.api.Distribution.BucketOptions.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.BucketOptions build() {
         com.google.api.Distribution.BucketOptions result = buildPartial();
         if (!result.isInitialized()) {
@@ -3329,6 +3441,7 @@ public com.google.api.Distribution.BucketOptions build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.api.Distribution.BucketOptions buildPartial() {
         com.google.api.Distribution.BucketOptions result = new com.google.api.Distribution.BucketOptions(this);
         if (optionsCase_ == 1) {
@@ -3357,32 +3470,39 @@ public com.google.api.Distribution.BucketOptions buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Distribution.BucketOptions) {
           return mergeFrom((com.google.api.Distribution.BucketOptions)other);
@@ -3416,10 +3536,12 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3968,11 +4090,13 @@ public com.google.api.Distribution.BucketOptions.ExplicitOrBuilder getExplicitBu
         onChanged();;
         return explicitBucketsBuilder_;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3994,6 +4118,7 @@ public static com.google.api.Distribution.BucketOptions getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<BucketOptions>
         PARSER = new com.google.protobuf.AbstractParser<BucketOptions>() {
+      @java.lang.Override
       public BucketOptions parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4011,6 +4136,7 @@ public com.google.protobuf.Parser<BucketOptions> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.api.Distribution.BucketOptions getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4192,6 +4318,7 @@ public long getBucketCounts(int index) {
   private int bucketCountsMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4201,6 +4328,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -4229,6 +4357,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -4413,6 +4542,7 @@ public static com.google.api.Distribution parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -4420,6 +4550,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Distribution prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -4458,6 +4589,7 @@ public static final class Builder extends
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_fieldAccessorTable
@@ -4480,6 +4612,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       count_ = 0L;
@@ -4505,15 +4638,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.DistributionProto.internal_static_google_api_Distribution_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Distribution getDefaultInstanceForType() {
       return com.google.api.Distribution.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Distribution build() {
       com.google.api.Distribution result = buildPartial();
       if (!result.isInitialized()) {
@@ -4522,6 +4658,7 @@ public com.google.api.Distribution build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Distribution buildPartial() {
       com.google.api.Distribution result = new com.google.api.Distribution(this);
       int from_bitField0_ = bitField0_;
@@ -4549,32 +4686,39 @@ public com.google.api.Distribution buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Distribution) {
         return mergeFrom((com.google.api.Distribution)other);
@@ -4616,10 +4760,12 @@ public Builder mergeFrom(com.google.api.Distribution other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5235,11 +5381,13 @@ public Builder clearBucketCounts() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -5261,6 +5409,7 @@ public static com.google.api.Distribution getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Distribution>
       PARSER = new com.google.protobuf.AbstractParser<Distribution>() {
+    @java.lang.Override
     public Distribution parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5278,6 +5427,7 @@ public com.google.protobuf.Parser<Distribution> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Distribution getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java
index 5c0d0b719..3195eb67d 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java
@@ -54,29 +54,27 @@ public static void registerAllExtensions(
   static {
     java.lang.String[] descriptorData = {
       "\n\035google/api/distribution.proto\022\ngoogle." +
-      "api\032\034google/api/annotations.proto\032\031googl" +
-      "e/protobuf/any.proto\032\037google/protobuf/ti" +
-      "mestamp.proto\"\256\005\n\014Distribution\022\r\n\005count\030" +
-      "\001 \001(\003\022\014\n\004mean\030\002 \001(\001\022 \n\030sum_of_squared_de" +
-      "viation\030\003 \001(\001\022-\n\005range\030\004 \001(\0132\036.google.ap" +
-      "i.Distribution.Range\022>\n\016bucket_options\030\006" +
-      " \001(\0132&.google.api.Distribution.BucketOpt" +
-      "ions\022\025\n\rbucket_counts\030\007 \003(\003\032!\n\005Range\022\013\n\003" +
-      "min\030\001 \001(\001\022\013\n\003max\030\002 \001(\001\032\265\003\n\rBucketOptions" +
-      "\022G\n\016linear_buckets\030\001 \001(\0132-.google.api.Di" +
-      "stribution.BucketOptions.LinearH\000\022Q\n\023exp" +
-      "onential_buckets\030\002 \001(\01322.google.api.Dist" +
-      "ribution.BucketOptions.ExponentialH\000\022K\n\020" +
-      "explicit_buckets\030\003 \001(\0132/.google.api.Dist" +
-      "ribution.BucketOptions.ExplicitH\000\032C\n\006Lin" +
-      "ear\022\032\n\022num_finite_buckets\030\001 \001(\005\022\r\n\005width" +
-      "\030\002 \001(\001\022\016\n\006offset\030\003 \001(\001\032O\n\013Exponential\022\032\n" +
-      "\022num_finite_buckets\030\001 \001(\005\022\025\n\rgrowth_fact" +
-      "or\030\002 \001(\001\022\r\n\005scale\030\003 \001(\001\032\032\n\010Explicit\022\016\n\006b" +
-      "ounds\030\001 \003(\001B\t\n\007optionsBj\n\016com.google.api" +
-      "B\021DistributionProtoP\001ZCgoogle.golang.org" +
-      "/genproto/googleapis/api/distribution;di" +
-      "stributionb\006proto3"
+      "api\032\034google/api/annotations.proto\"\256\005\n\014Di" +
+      "stribution\022\r\n\005count\030\001 \001(\003\022\014\n\004mean\030\002 \001(\001\022" +
+      " \n\030sum_of_squared_deviation\030\003 \001(\001\022-\n\005ran" +
+      "ge\030\004 \001(\0132\036.google.api.Distribution.Range" +
+      "\022>\n\016bucket_options\030\006 \001(\0132&.google.api.Di" +
+      "stribution.BucketOptions\022\025\n\rbucket_count" +
+      "s\030\007 \003(\003\032!\n\005Range\022\013\n\003min\030\001 \001(\001\022\013\n\003max\030\002 \001" +
+      "(\001\032\265\003\n\rBucketOptions\022G\n\016linear_buckets\030\001" +
+      " \001(\0132-.google.api.Distribution.BucketOpt" +
+      "ions.LinearH\000\022Q\n\023exponential_buckets\030\002 \001" +
+      "(\01322.google.api.Distribution.BucketOptio" +
+      "ns.ExponentialH\000\022K\n\020explicit_buckets\030\003 \001" +
+      "(\0132/.google.api.Distribution.BucketOptio" +
+      "ns.ExplicitH\000\032C\n\006Linear\022\032\n\022num_finite_bu" +
+      "ckets\030\001 \001(\005\022\r\n\005width\030\002 \001(\001\022\016\n\006offset\030\003 \001" +
+      "(\001\032O\n\013Exponential\022\032\n\022num_finite_buckets\030" +
+      "\001 \001(\005\022\025\n\rgrowth_factor\030\002 \001(\001\022\r\n\005scale\030\003 " +
+      "\001(\001\032\032\n\010Explicit\022\016\n\006bounds\030\001 \003(\001B\t\n\007optio" +
+      "nsBj\n\016com.google.apiB\021DistributionProtoP" +
+      "\001ZCgoogle.golang.org/genproto/googleapis" +
+      "/api/distribution;distributionb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -90,8 +88,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.protobuf.AnyProto.getDescriptor(),
-          com.google.protobuf.TimestampProto.getDescriptor(),
         }, assigner);
     internal_static_google_api_Distribution_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -130,8 +126,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
         internal_static_google_api_Distribution_BucketOptions_Explicit_descriptor,
         new java.lang.String[] { "Bounds", });
     com.google.api.AnnotationsProto.getDescriptor();
-    com.google.protobuf.AnyProto.getDescriptor();
-    com.google.protobuf.TimestampProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Documentation.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
index 75e15cd3b..3fd4304fe 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
@@ -100,13 +100,6 @@ private Documentation(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -143,6 +136,13 @@ private Documentation(
                 input.readMessage(com.google.api.Page.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -166,6 +166,7 @@ private Documentation(
     return com.google.api.DocumentationProto.internal_static_google_api_Documentation_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.DocumentationProto.internal_static_google_api_Documentation_fieldAccessorTable
@@ -442,6 +443,7 @@ public java.lang.String getOverview() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -451,6 +453,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSummaryBytes().isEmpty()) {
@@ -471,6 +474,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -619,6 +623,7 @@ public static com.google.api.Documentation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -626,6 +631,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Documentation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -702,6 +708,7 @@ public static final class Builder extends
       return com.google.api.DocumentationProto.internal_static_google_api_Documentation_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.DocumentationProto.internal_static_google_api_Documentation_fieldAccessorTable
@@ -726,6 +733,7 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       summary_ = "";
@@ -749,15 +757,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.DocumentationProto.internal_static_google_api_Documentation_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Documentation getDefaultInstanceForType() {
       return com.google.api.Documentation.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Documentation build() {
       com.google.api.Documentation result = buildPartial();
       if (!result.isInitialized()) {
@@ -766,6 +777,7 @@ public com.google.api.Documentation build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Documentation buildPartial() {
       com.google.api.Documentation result = new com.google.api.Documentation(this);
       int from_bitField0_ = bitField0_;
@@ -796,32 +808,39 @@ public com.google.api.Documentation buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Documentation) {
         return mergeFrom((com.google.api.Documentation)other);
@@ -902,10 +921,12 @@ public Builder mergeFrom(com.google.api.Documentation other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1898,11 +1919,13 @@ public Builder setOverviewBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1924,6 +1947,7 @@ public static com.google.api.Documentation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Documentation>
       PARSER = new com.google.protobuf.AbstractParser<Documentation>() {
+    @java.lang.Override
     public Documentation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1941,6 +1965,7 @@ public com.google.protobuf.Parser<Documentation> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Documentation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
index 10cb7c6a0..87d659f4d 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
@@ -49,13 +49,6 @@ private DocumentationRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,6 +67,13 @@ private DocumentationRule(
             deprecationDescription_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,6 +91,7 @@ private DocumentationRule(
     return com.google.api.DocumentationProto.internal_static_google_api_DocumentationRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.DocumentationProto.internal_static_google_api_DocumentationRule_fieldAccessorTable
@@ -237,6 +238,7 @@ public java.lang.String getDeprecationDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -246,6 +248,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -260,6 +263,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -388,6 +392,7 @@ public static com.google.api.DocumentationRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,6 +400,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.DocumentationRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,6 +428,7 @@ public static final class Builder extends
       return com.google.api.DocumentationProto.internal_static_google_api_DocumentationRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.DocumentationProto.internal_static_google_api_DocumentationRule_fieldAccessorTable
@@ -444,6 +451,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -455,15 +463,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.DocumentationProto.internal_static_google_api_DocumentationRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.DocumentationRule getDefaultInstanceForType() {
       return com.google.api.DocumentationRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.DocumentationRule build() {
       com.google.api.DocumentationRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -472,6 +483,7 @@ public com.google.api.DocumentationRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.DocumentationRule buildPartial() {
       com.google.api.DocumentationRule result = new com.google.api.DocumentationRule(this);
       result.selector_ = selector_;
@@ -481,32 +493,39 @@ public com.google.api.DocumentationRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.DocumentationRule) {
         return mergeFrom((com.google.api.DocumentationRule)other);
@@ -535,10 +554,12 @@ public Builder mergeFrom(com.google.api.DocumentationRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,11 +874,13 @@ public Builder setDeprecationDescriptionBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -879,6 +902,7 @@ public static com.google.api.DocumentationRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<DocumentationRule>
       PARSER = new com.google.protobuf.AbstractParser<DocumentationRule>() {
+    @java.lang.Override
     public DocumentationRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -896,6 +920,7 @@ public com.google.protobuf.Parser<DocumentationRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.DocumentationRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
index 92f514af5..9e7b26d46 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
@@ -64,13 +64,6 @@ private Endpoint(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -106,6 +99,13 @@ private Endpoint(
             target_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -129,6 +129,7 @@ private Endpoint(
     return com.google.api.EndpointProto.internal_static_google_api_Endpoint_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.EndpointProto.internal_static_google_api_Endpoint_fieldAccessorTable
@@ -348,6 +349,7 @@ public boolean getAllowCors() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -357,6 +359,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -377,6 +380,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -535,6 +539,7 @@ public static com.google.api.Endpoint parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -542,6 +547,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Endpoint prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -582,6 +588,7 @@ public static final class Builder extends
       return com.google.api.EndpointProto.internal_static_google_api_Endpoint_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.EndpointProto.internal_static_google_api_Endpoint_fieldAccessorTable
@@ -604,6 +611,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -619,15 +627,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.EndpointProto.internal_static_google_api_Endpoint_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Endpoint getDefaultInstanceForType() {
       return com.google.api.Endpoint.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Endpoint build() {
       com.google.api.Endpoint result = buildPartial();
       if (!result.isInitialized()) {
@@ -636,6 +647,7 @@ public com.google.api.Endpoint build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Endpoint buildPartial() {
       com.google.api.Endpoint result = new com.google.api.Endpoint(this);
       int from_bitField0_ = bitField0_;
@@ -658,32 +670,39 @@ public com.google.api.Endpoint buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Endpoint) {
         return mergeFrom((com.google.api.Endpoint)other);
@@ -731,10 +750,12 @@ public Builder mergeFrom(com.google.api.Endpoint other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1286,11 +1307,13 @@ public Builder clearAllowCors() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1312,6 +1335,7 @@ public static com.google.api.Endpoint getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Endpoint>
       PARSER = new com.google.protobuf.AbstractParser<Endpoint>() {
+    @java.lang.Override
     public Endpoint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1329,6 +1353,7 @@ public com.google.protobuf.Parser<Endpoint> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Endpoint getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Experimental.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Experimental.java
deleted file mode 100644
index 92c6e4cd6..000000000
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Experimental.java
+++ /dev/null
@@ -1,628 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/api/experimental/experimental.proto
-
-package com.google.api;
-
-/**
- * <pre>
- * Experimental service configuration. These configuration options can
- * only be used by whitelisted users.
- * </pre>
- *
- * Protobuf type {@code google.api.Experimental}
- */
-public  final class Experimental extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.api.Experimental)
-    ExperimentalOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Experimental.newBuilder() to construct.
-  private Experimental(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Experimental() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Experimental(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 66: {
-            com.google.api.AuthorizationConfig.Builder subBuilder = null;
-            if (authorization_ != null) {
-              subBuilder = authorization_.toBuilder();
-            }
-            authorization_ = input.readMessage(com.google.api.AuthorizationConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(authorization_);
-              authorization_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.api.ExperimentalProto.internal_static_google_api_Experimental_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.api.ExperimentalProto.internal_static_google_api_Experimental_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.api.Experimental.class, com.google.api.Experimental.Builder.class);
-  }
-
-  public static final int AUTHORIZATION_FIELD_NUMBER = 8;
-  private com.google.api.AuthorizationConfig authorization_;
-  /**
-   * <pre>
-   * Authorization configuration.
-   * </pre>
-   *
-   * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-   */
-  public boolean hasAuthorization() {
-    return authorization_ != null;
-  }
-  /**
-   * <pre>
-   * Authorization configuration.
-   * </pre>
-   *
-   * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-   */
-  public com.google.api.AuthorizationConfig getAuthorization() {
-    return authorization_ == null ? com.google.api.AuthorizationConfig.getDefaultInstance() : authorization_;
-  }
-  /**
-   * <pre>
-   * Authorization configuration.
-   * </pre>
-   *
-   * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-   */
-  public com.google.api.AuthorizationConfigOrBuilder getAuthorizationOrBuilder() {
-    return getAuthorization();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (authorization_ != null) {
-      output.writeMessage(8, getAuthorization());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (authorization_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(8, getAuthorization());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.api.Experimental)) {
-      return super.equals(obj);
-    }
-    com.google.api.Experimental other = (com.google.api.Experimental) obj;
-
-    boolean result = true;
-    result = result && (hasAuthorization() == other.hasAuthorization());
-    if (hasAuthorization()) {
-      result = result && getAuthorization()
-          .equals(other.getAuthorization());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasAuthorization()) {
-      hash = (37 * hash) + AUTHORIZATION_FIELD_NUMBER;
-      hash = (53 * hash) + getAuthorization().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.api.Experimental parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.api.Experimental parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.api.Experimental parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.api.Experimental parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.api.Experimental parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.api.Experimental parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.api.Experimental parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.api.Experimental parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.api.Experimental parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.api.Experimental parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.api.Experimental parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.api.Experimental parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.api.Experimental prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * Experimental service configuration. These configuration options can
-   * only be used by whitelisted users.
-   * </pre>
-   *
-   * Protobuf type {@code google.api.Experimental}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:google.api.Experimental)
-      com.google.api.ExperimentalOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.api.ExperimentalProto.internal_static_google_api_Experimental_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.api.ExperimentalProto.internal_static_google_api_Experimental_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.api.Experimental.class, com.google.api.Experimental.Builder.class);
-    }
-
-    // Construct using com.google.api.Experimental.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (authorizationBuilder_ == null) {
-        authorization_ = null;
-      } else {
-        authorization_ = null;
-        authorizationBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.api.ExperimentalProto.internal_static_google_api_Experimental_descriptor;
-    }
-
-    public com.google.api.Experimental getDefaultInstanceForType() {
-      return com.google.api.Experimental.getDefaultInstance();
-    }
-
-    public com.google.api.Experimental build() {
-      com.google.api.Experimental result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.api.Experimental buildPartial() {
-      com.google.api.Experimental result = new com.google.api.Experimental(this);
-      if (authorizationBuilder_ == null) {
-        result.authorization_ = authorization_;
-      } else {
-        result.authorization_ = authorizationBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.api.Experimental) {
-        return mergeFrom((com.google.api.Experimental)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.api.Experimental other) {
-      if (other == com.google.api.Experimental.getDefaultInstance()) return this;
-      if (other.hasAuthorization()) {
-        mergeAuthorization(other.getAuthorization());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.api.Experimental parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.api.Experimental) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.api.AuthorizationConfig authorization_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.api.AuthorizationConfig, com.google.api.AuthorizationConfig.Builder, com.google.api.AuthorizationConfigOrBuilder> authorizationBuilder_;
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public boolean hasAuthorization() {
-      return authorizationBuilder_ != null || authorization_ != null;
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public com.google.api.AuthorizationConfig getAuthorization() {
-      if (authorizationBuilder_ == null) {
-        return authorization_ == null ? com.google.api.AuthorizationConfig.getDefaultInstance() : authorization_;
-      } else {
-        return authorizationBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public Builder setAuthorization(com.google.api.AuthorizationConfig value) {
-      if (authorizationBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        authorization_ = value;
-        onChanged();
-      } else {
-        authorizationBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public Builder setAuthorization(
-        com.google.api.AuthorizationConfig.Builder builderForValue) {
-      if (authorizationBuilder_ == null) {
-        authorization_ = builderForValue.build();
-        onChanged();
-      } else {
-        authorizationBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public Builder mergeAuthorization(com.google.api.AuthorizationConfig value) {
-      if (authorizationBuilder_ == null) {
-        if (authorization_ != null) {
-          authorization_ =
-            com.google.api.AuthorizationConfig.newBuilder(authorization_).mergeFrom(value).buildPartial();
-        } else {
-          authorization_ = value;
-        }
-        onChanged();
-      } else {
-        authorizationBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public Builder clearAuthorization() {
-      if (authorizationBuilder_ == null) {
-        authorization_ = null;
-        onChanged();
-      } else {
-        authorization_ = null;
-        authorizationBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public com.google.api.AuthorizationConfig.Builder getAuthorizationBuilder() {
-      
-      onChanged();
-      return getAuthorizationFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    public com.google.api.AuthorizationConfigOrBuilder getAuthorizationOrBuilder() {
-      if (authorizationBuilder_ != null) {
-        return authorizationBuilder_.getMessageOrBuilder();
-      } else {
-        return authorization_ == null ?
-            com.google.api.AuthorizationConfig.getDefaultInstance() : authorization_;
-      }
-    }
-    /**
-     * <pre>
-     * Authorization configuration.
-     * </pre>
-     *
-     * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.api.AuthorizationConfig, com.google.api.AuthorizationConfig.Builder, com.google.api.AuthorizationConfigOrBuilder> 
-        getAuthorizationFieldBuilder() {
-      if (authorizationBuilder_ == null) {
-        authorizationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.api.AuthorizationConfig, com.google.api.AuthorizationConfig.Builder, com.google.api.AuthorizationConfigOrBuilder>(
-                getAuthorization(),
-                getParentForChildren(),
-                isClean());
-        authorization_ = null;
-      }
-      return authorizationBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.api.Experimental)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.api.Experimental)
-  private static final com.google.api.Experimental DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.api.Experimental();
-  }
-
-  public static com.google.api.Experimental getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Experimental>
-      PARSER = new com.google.protobuf.AbstractParser<Experimental>() {
-    public Experimental parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Experimental(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Experimental> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Experimental> getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.api.Experimental getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ExperimentalOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ExperimentalOrBuilder.java
deleted file mode 100644
index 8792ce28a..000000000
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ExperimentalOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/api/experimental/experimental.proto
-
-package com.google.api;
-
-public interface ExperimentalOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.api.Experimental)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <pre>
-   * Authorization configuration.
-   * </pre>
-   *
-   * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-   */
-  boolean hasAuthorization();
-  /**
-   * <pre>
-   * Authorization configuration.
-   * </pre>
-   *
-   * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-   */
-  com.google.api.AuthorizationConfig getAuthorization();
-  /**
-   * <pre>
-   * Authorization configuration.
-   * </pre>
-   *
-   * <code>.google.api.AuthorizationConfig authorization = 8;</code>
-   */
-  com.google.api.AuthorizationConfigOrBuilder getAuthorizationOrBuilder();
-}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Http.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Http.java
index 2076b2e40..35f1938ba 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Http.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Http.java
@@ -50,13 +50,6 @@ private Http(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               rules_ = new java.util.ArrayList<com.google.api.HttpRule>();
@@ -71,6 +64,13 @@ private Http(
             fullyDecodeReservedExpansion_ = input.readBool();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,6 +91,7 @@ private Http(
     return com.google.api.HttpProto.internal_static_google_api_Http_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.HttpProto.internal_static_google_api_Http_fieldAccessorTable
@@ -177,6 +178,7 @@ public boolean getFullyDecodeReservedExpansion() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,6 +188,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < rules_.size(); i++) {
@@ -197,6 +200,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,6 +327,7 @@ public static com.google.api.Http parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -330,6 +335,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Http prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,6 +365,7 @@ public static final class Builder extends
       return com.google.api.HttpProto.internal_static_google_api_Http_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.HttpProto.internal_static_google_api_Http_fieldAccessorTable
@@ -382,6 +389,7 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
@@ -395,15 +403,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.HttpProto.internal_static_google_api_Http_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Http getDefaultInstanceForType() {
       return com.google.api.Http.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Http build() {
       com.google.api.Http result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,6 +423,7 @@ public com.google.api.Http build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Http buildPartial() {
       com.google.api.Http result = new com.google.api.Http(this);
       int from_bitField0_ = bitField0_;
@@ -431,32 +443,39 @@ public com.google.api.Http buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Http) {
         return mergeFrom((com.google.api.Http)other);
@@ -502,10 +521,12 @@ public Builder mergeFrom(com.google.api.Http other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -904,11 +925,13 @@ public Builder clearFullyDecodeReservedExpansion() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -930,6 +953,7 @@ public static com.google.api.Http getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Http>
       PARSER = new com.google.protobuf.AbstractParser<Http>() {
+    @java.lang.Override
     public Http parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -947,6 +971,7 @@ public com.google.protobuf.Parser<Http> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Http getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
index 966fa513c..3af0c8e08 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
@@ -76,13 +76,6 @@ private HttpBody(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -103,6 +96,13 @@ private HttpBody(
                 input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,6 +123,7 @@ private HttpBody(
     return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_fieldAccessorTable
@@ -247,6 +248,7 @@ public com.google.protobuf.AnyOrBuilder getExtensionsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -256,6 +258,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getContentTypeBytes().isEmpty()) {
@@ -270,6 +273,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -402,6 +406,7 @@ public static com.google.api.HttpBody parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -409,6 +414,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.HttpBody prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -463,6 +469,7 @@ public static final class Builder extends
       return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_fieldAccessorTable
@@ -486,6 +493,7 @@ private void maybeForceBuilderInitialization() {
         getExtensionsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       contentType_ = "";
@@ -501,15 +509,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.HttpBody getDefaultInstanceForType() {
       return com.google.api.HttpBody.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.HttpBody build() {
       com.google.api.HttpBody result = buildPartial();
       if (!result.isInitialized()) {
@@ -518,6 +529,7 @@ public com.google.api.HttpBody build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.HttpBody buildPartial() {
       com.google.api.HttpBody result = new com.google.api.HttpBody(this);
       int from_bitField0_ = bitField0_;
@@ -538,32 +550,39 @@ public com.google.api.HttpBody buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.HttpBody) {
         return mergeFrom((com.google.api.HttpBody)other);
@@ -613,10 +632,12 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1095,11 +1116,13 @@ public com.google.protobuf.Any.Builder addExtensionsBuilder(
       }
       return extensionsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1121,6 +1144,7 @@ public static com.google.api.HttpBody getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<HttpBody>
       PARSER = new com.google.protobuf.AbstractParser<HttpBody>() {
+    @java.lang.Override
     public HttpBody parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1138,6 +1162,7 @@ public com.google.protobuf.Parser<HttpBody> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.HttpBody getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java
index 0d8086a85..0f1537815 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java
@@ -222,13 +222,6 @@ private HttpRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -294,6 +287,13 @@ private HttpRule(
                 input.readMessage(com.google.api.HttpRule.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -314,6 +314,7 @@ private HttpRule(
     return com.google.api.HttpProto.internal_static_google_api_HttpRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.HttpProto.internal_static_google_api_HttpRule_fieldAccessorTable
@@ -828,6 +829,7 @@ public com.google.api.HttpRuleOrBuilder getAdditionalBindingsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -837,6 +839,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -869,6 +872,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1078,6 +1082,7 @@ public static com.google.api.HttpRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1085,6 +1090,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.HttpRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1285,6 +1291,7 @@ public static final class Builder extends
       return com.google.api.HttpProto.internal_static_google_api_HttpRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.HttpProto.internal_static_google_api_HttpRule_fieldAccessorTable
@@ -1308,6 +1315,7 @@ private void maybeForceBuilderInitialization() {
         getAdditionalBindingsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -1325,15 +1333,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.HttpProto.internal_static_google_api_HttpRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.HttpRule getDefaultInstanceForType() {
       return com.google.api.HttpRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.HttpRule build() {
       com.google.api.HttpRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -1342,6 +1353,7 @@ public com.google.api.HttpRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.HttpRule buildPartial() {
       com.google.api.HttpRule result = new com.google.api.HttpRule(this);
       int from_bitField0_ = bitField0_;
@@ -1385,32 +1397,39 @@ public com.google.api.HttpRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.HttpRule) {
         return mergeFrom((com.google.api.HttpRule)other);
@@ -1500,10 +1519,12 @@ public Builder mergeFrom(com.google.api.HttpRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2782,11 +2803,13 @@ public com.google.api.HttpRule.Builder addAdditionalBindingsBuilder(
       }
       return additionalBindingsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2808,6 +2831,7 @@ public static com.google.api.HttpRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<HttpRule>
       PARSER = new com.google.protobuf.AbstractParser<HttpRule>() {
+    @java.lang.Override
     public HttpRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2825,6 +2849,7 @@ public com.google.protobuf.Parser<HttpRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.HttpRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
index dc3ff3607..5ccbe999a 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
@@ -49,13 +49,6 @@ private LabelDescriptor(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,6 +67,13 @@ private LabelDescriptor(
             description_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,6 +91,7 @@ private LabelDescriptor(
     return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_fieldAccessorTable
@@ -295,6 +296,7 @@ public int getValueTypeValue() {
    * <code>.google.api.LabelDescriptor.ValueType value_type = 2;</code>
    */
   public com.google.api.LabelDescriptor.ValueType getValueType() {
+    @SuppressWarnings("deprecation")
     com.google.api.LabelDescriptor.ValueType result = com.google.api.LabelDescriptor.ValueType.valueOf(valueType_);
     return result == null ? com.google.api.LabelDescriptor.ValueType.UNRECOGNIZED : result;
   }
@@ -342,6 +344,7 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -351,6 +354,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getKeyBytes().isEmpty()) {
@@ -365,6 +369,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -493,6 +498,7 @@ public static com.google.api.LabelDescriptor parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -500,6 +506,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.LabelDescriptor prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -527,6 +534,7 @@ public static final class Builder extends
       return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_fieldAccessorTable
@@ -549,6 +557,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       key_ = "";
@@ -560,15 +569,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.LabelDescriptor getDefaultInstanceForType() {
       return com.google.api.LabelDescriptor.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.LabelDescriptor build() {
       com.google.api.LabelDescriptor result = buildPartial();
       if (!result.isInitialized()) {
@@ -577,6 +589,7 @@ public com.google.api.LabelDescriptor build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.LabelDescriptor buildPartial() {
       com.google.api.LabelDescriptor result = new com.google.api.LabelDescriptor(this);
       result.key_ = key_;
@@ -586,32 +599,39 @@ public com.google.api.LabelDescriptor buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.LabelDescriptor) {
         return mergeFrom((com.google.api.LabelDescriptor)other);
@@ -639,10 +659,12 @@ public Builder mergeFrom(com.google.api.LabelDescriptor other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -781,6 +803,7 @@ public Builder setValueTypeValue(int value) {
      * <code>.google.api.LabelDescriptor.ValueType value_type = 2;</code>
      */
     public com.google.api.LabelDescriptor.ValueType getValueType() {
+      @SuppressWarnings("deprecation")
       com.google.api.LabelDescriptor.ValueType result = com.google.api.LabelDescriptor.ValueType.valueOf(valueType_);
       return result == null ? com.google.api.LabelDescriptor.ValueType.UNRECOGNIZED : result;
     }
@@ -902,11 +925,13 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -928,6 +953,7 @@ public static com.google.api.LabelDescriptor getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<LabelDescriptor>
       PARSER = new com.google.protobuf.AbstractParser<LabelDescriptor>() {
+    @java.lang.Override
     public LabelDescriptor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -945,6 +971,7 @@ public com.google.protobuf.Parser<LabelDescriptor> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.LabelDescriptor getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
index 14bc81ab0..19fcd4307 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
@@ -56,13 +56,6 @@ private LogDescriptor(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -90,6 +83,13 @@ private LogDescriptor(
             displayName_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,6 +110,7 @@ private LogDescriptor(
     return com.google.api.LogProto.internal_static_google_api_LogDescriptor_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.LogProto.internal_static_google_api_LogDescriptor_fieldAccessorTable
@@ -320,6 +321,7 @@ public java.lang.String getDisplayName() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -329,6 +331,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -346,6 +349,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -484,6 +488,7 @@ public static com.google.api.LogDescriptor parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -491,6 +496,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.LogDescriptor prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -524,6 +530,7 @@ public static final class Builder extends
       return com.google.api.LogProto.internal_static_google_api_LogDescriptor_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.LogProto.internal_static_google_api_LogDescriptor_fieldAccessorTable
@@ -547,6 +554,7 @@ private void maybeForceBuilderInitialization() {
         getLabelsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -564,15 +572,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.LogProto.internal_static_google_api_LogDescriptor_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.LogDescriptor getDefaultInstanceForType() {
       return com.google.api.LogDescriptor.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.LogDescriptor build() {
       com.google.api.LogDescriptor result = buildPartial();
       if (!result.isInitialized()) {
@@ -581,6 +592,7 @@ public com.google.api.LogDescriptor build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.LogDescriptor buildPartial() {
       com.google.api.LogDescriptor result = new com.google.api.LogDescriptor(this);
       int from_bitField0_ = bitField0_;
@@ -602,32 +614,39 @@ public com.google.api.LogDescriptor buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.LogDescriptor) {
         return mergeFrom((com.google.api.LogDescriptor)other);
@@ -682,10 +701,12 @@ public Builder mergeFrom(com.google.api.LogDescriptor other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1344,11 +1365,13 @@ public Builder setDisplayNameBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1370,6 +1393,7 @@ public static com.google.api.LogDescriptor getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<LogDescriptor>
       PARSER = new com.google.protobuf.AbstractParser<LogDescriptor>() {
+    @java.lang.Override
     public LogDescriptor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1387,6 +1411,7 @@ public com.google.protobuf.Parser<LogDescriptor> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.LogDescriptor getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Logging.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Logging.java
index 7c2e9506a..5df01da10 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Logging.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Logging.java
@@ -74,13 +74,6 @@ private Logging(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               producerDestinations_ = new java.util.ArrayList<com.google.api.Logging.LoggingDestination>();
@@ -99,6 +92,13 @@ private Logging(
                 input.readMessage(com.google.api.Logging.LoggingDestination.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,6 +122,7 @@ private Logging(
     return com.google.api.LoggingProto.internal_static_google_api_Logging_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.LoggingProto.internal_static_google_api_Logging_fieldAccessorTable
@@ -246,13 +247,6 @@ private LoggingDestination(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
@@ -268,6 +262,13 @@ private LoggingDestination(
               monitoredResource_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -288,6 +289,7 @@ private LoggingDestination(
       return com.google.api.LoggingProto.internal_static_google_api_Logging_LoggingDestination_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.LoggingProto.internal_static_google_api_Logging_LoggingDestination_fieldAccessorTable
@@ -398,6 +400,7 @@ public java.lang.String getLogs(int index) {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -407,6 +410,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < logs_.size(); i++) {
@@ -418,6 +422,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -546,6 +551,7 @@ public static com.google.api.Logging.LoggingDestination parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -553,6 +559,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.api.Logging.LoggingDestination prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -581,6 +588,7 @@ public static final class Builder extends
         return com.google.api.LoggingProto.internal_static_google_api_Logging_LoggingDestination_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.LoggingProto.internal_static_google_api_Logging_LoggingDestination_fieldAccessorTable
@@ -603,6 +611,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         monitoredResource_ = "";
@@ -612,15 +621,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.api.LoggingProto.internal_static_google_api_Logging_LoggingDestination_descriptor;
       }
 
+      @java.lang.Override
       public com.google.api.Logging.LoggingDestination getDefaultInstanceForType() {
         return com.google.api.Logging.LoggingDestination.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.api.Logging.LoggingDestination build() {
         com.google.api.Logging.LoggingDestination result = buildPartial();
         if (!result.isInitialized()) {
@@ -629,6 +641,7 @@ public com.google.api.Logging.LoggingDestination build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.api.Logging.LoggingDestination buildPartial() {
         com.google.api.Logging.LoggingDestination result = new com.google.api.Logging.LoggingDestination(this);
         int from_bitField0_ = bitField0_;
@@ -644,32 +657,39 @@ public com.google.api.Logging.LoggingDestination buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Logging.LoggingDestination) {
           return mergeFrom((com.google.api.Logging.LoggingDestination)other);
@@ -700,10 +720,12 @@ public Builder mergeFrom(com.google.api.Logging.LoggingDestination other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -973,11 +995,13 @@ public Builder addLogsBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -999,6 +1023,7 @@ public static com.google.api.Logging.LoggingDestination getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<LoggingDestination>
         PARSER = new com.google.protobuf.AbstractParser<LoggingDestination>() {
+      @java.lang.Override
       public LoggingDestination parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1016,6 +1041,7 @@ public com.google.protobuf.Parser<LoggingDestination> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.api.Logging.LoggingDestination getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1163,6 +1189,7 @@ public com.google.api.Logging.LoggingDestinationOrBuilder getConsumerDestination
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1172,6 +1199,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < producerDestinations_.size(); i++) {
@@ -1183,6 +1211,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1310,6 +1339,7 @@ public static com.google.api.Logging parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1317,6 +1347,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Logging prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1370,6 +1401,7 @@ public static final class Builder extends
       return com.google.api.LoggingProto.internal_static_google_api_Logging_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.LoggingProto.internal_static_google_api_Logging_fieldAccessorTable
@@ -1394,6 +1426,7 @@ private void maybeForceBuilderInitialization() {
         getConsumerDestinationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (producerDestinationsBuilder_ == null) {
@@ -1411,15 +1444,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.LoggingProto.internal_static_google_api_Logging_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Logging getDefaultInstanceForType() {
       return com.google.api.Logging.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Logging build() {
       com.google.api.Logging result = buildPartial();
       if (!result.isInitialized()) {
@@ -1428,6 +1464,7 @@ public com.google.api.Logging build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Logging buildPartial() {
       com.google.api.Logging result = new com.google.api.Logging(this);
       int from_bitField0_ = bitField0_;
@@ -1453,32 +1490,39 @@ public com.google.api.Logging buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Logging) {
         return mergeFrom((com.google.api.Logging)other);
@@ -1547,10 +1591,12 @@ public Builder mergeFrom(com.google.api.Logging other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2301,11 +2347,13 @@ public com.google.api.Logging.LoggingDestination.Builder addConsumerDestinations
       }
       return consumerDestinationsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2327,6 +2375,7 @@ public static com.google.api.Logging getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Logging>
       PARSER = new com.google.protobuf.AbstractParser<Logging>() {
+    @java.lang.Override
     public Logging parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2344,6 +2393,7 @@ public com.google.protobuf.Parser<Logging> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Logging getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metadata.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metadata.java
new file mode 100644
index 000000000..a98b3f9a9
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metadata.java
@@ -0,0 +1,1258 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/metadata.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * Information about the API as a whole. Generally used for packaging
+ * and documentation.
+ * </pre>
+ *
+ * Protobuf type {@code google.api.Metadata}
+ */
+public  final class Metadata extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.Metadata)
+    MetadataOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Metadata.newBuilder() to construct.
+  private Metadata(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private Metadata() {
+    productName_ = "";
+    productUri_ = "";
+    packageName_ = "";
+    packageNamespace_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Metadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            productName_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            productUri_ = s;
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            packageName_ = s;
+            break;
+          }
+          case 34: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              packageNamespace_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000008;
+            }
+            packageNamespace_.add(s);
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+        packageNamespace_ = packageNamespace_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.MetadataProto.internal_static_google_api_Metadata_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.MetadataProto.internal_static_google_api_Metadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.Metadata.class, com.google.api.Metadata.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int PRODUCT_NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object productName_;
+  /**
+   * <pre>
+   * The name of the product.
+   * This should be set to the colloquial name of the API, and is used
+   * for things such as determining the package name. If not set, it is
+   * inferred based on the final proto package segment before the version.
+   * Specify this in appropriate title casing, with space as the word
+   * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+   * This value may be used as-is in documentation, and code generators should
+   * normalize it appropriately for idiomatic package, module, etc. names in
+   * their language. However, this value is superseded by the language specific
+   * options introduced for some languages.
+   * </pre>
+   *
+   * <code>string product_name = 1;</code>
+   */
+  public java.lang.String getProductName() {
+    java.lang.Object ref = productName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      productName_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The name of the product.
+   * This should be set to the colloquial name of the API, and is used
+   * for things such as determining the package name. If not set, it is
+   * inferred based on the final proto package segment before the version.
+   * Specify this in appropriate title casing, with space as the word
+   * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+   * This value may be used as-is in documentation, and code generators should
+   * normalize it appropriately for idiomatic package, module, etc. names in
+   * their language. However, this value is superseded by the language specific
+   * options introduced for some languages.
+   * </pre>
+   *
+   * <code>string product_name = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getProductNameBytes() {
+    java.lang.Object ref = productName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      productName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PRODUCT_URI_FIELD_NUMBER = 2;
+  private volatile java.lang.Object productUri_;
+  /**
+   * <pre>
+   * The URI for this product.
+   * This may be used in documentation and package metadata.
+   * </pre>
+   *
+   * <code>string product_uri = 2;</code>
+   */
+  public java.lang.String getProductUri() {
+    java.lang.Object ref = productUri_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      productUri_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The URI for this product.
+   * This may be used in documentation and package metadata.
+   * </pre>
+   *
+   * <code>string product_uri = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getProductUriBytes() {
+    java.lang.Object ref = productUri_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      productUri_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PACKAGE_NAME_FIELD_NUMBER = 3;
+  private volatile java.lang.Object packageName_;
+  /**
+   * <pre>
+   * The name of the client library package, if it differs from the
+   * product name.
+   * </pre>
+   *
+   * <code>string package_name = 3;</code>
+   */
+  public java.lang.String getPackageName() {
+    java.lang.Object ref = packageName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      packageName_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The name of the client library package, if it differs from the
+   * product name.
+   * </pre>
+   *
+   * <code>string package_name = 3;</code>
+   */
+  public com.google.protobuf.ByteString
+      getPackageNameBytes() {
+    java.lang.Object ref = packageName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      packageName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PACKAGE_NAMESPACE_FIELD_NUMBER = 4;
+  private com.google.protobuf.LazyStringList packageNamespace_;
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  public com.google.protobuf.ProtocolStringList
+      getPackageNamespaceList() {
+    return packageNamespace_;
+  }
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  public int getPackageNamespaceCount() {
+    return packageNamespace_.size();
+  }
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  public java.lang.String getPackageNamespace(int index) {
+    return packageNamespace_.get(index);
+  }
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  public com.google.protobuf.ByteString
+      getPackageNamespaceBytes(int index) {
+    return packageNamespace_.getByteString(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getProductNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, productName_);
+    }
+    if (!getProductUriBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, productUri_);
+    }
+    if (!getPackageNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, packageName_);
+    }
+    for (int i = 0; i < packageNamespace_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, packageNamespace_.getRaw(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getProductNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, productName_);
+    }
+    if (!getProductUriBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, productUri_);
+    }
+    if (!getPackageNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, packageName_);
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < packageNamespace_.size(); i++) {
+        dataSize += computeStringSizeNoTag(packageNamespace_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getPackageNamespaceList().size();
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.Metadata)) {
+      return super.equals(obj);
+    }
+    com.google.api.Metadata other = (com.google.api.Metadata) obj;
+
+    boolean result = true;
+    result = result && getProductName()
+        .equals(other.getProductName());
+    result = result && getProductUri()
+        .equals(other.getProductUri());
+    result = result && getPackageName()
+        .equals(other.getPackageName());
+    result = result && getPackageNamespaceList()
+        .equals(other.getPackageNamespaceList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PRODUCT_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getProductName().hashCode();
+    hash = (37 * hash) + PRODUCT_URI_FIELD_NUMBER;
+    hash = (53 * hash) + getProductUri().hashCode();
+    hash = (37 * hash) + PACKAGE_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getPackageName().hashCode();
+    if (getPackageNamespaceCount() > 0) {
+      hash = (37 * hash) + PACKAGE_NAMESPACE_FIELD_NUMBER;
+      hash = (53 * hash) + getPackageNamespaceList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.Metadata parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Metadata parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Metadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Metadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Metadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Metadata parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Metadata parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Metadata parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Metadata parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.Metadata parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Metadata parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Metadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.Metadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * Information about the API as a whole. Generally used for packaging
+   * and documentation.
+   * </pre>
+   *
+   * Protobuf type {@code google.api.Metadata}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.Metadata)
+      com.google.api.MetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.MetadataProto.internal_static_google_api_Metadata_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.MetadataProto.internal_static_google_api_Metadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.Metadata.class, com.google.api.Metadata.Builder.class);
+    }
+
+    // Construct using com.google.api.Metadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      productName_ = "";
+
+      productUri_ = "";
+
+      packageName_ = "";
+
+      packageNamespace_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.MetadataProto.internal_static_google_api_Metadata_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.Metadata getDefaultInstanceForType() {
+      return com.google.api.Metadata.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.Metadata build() {
+      com.google.api.Metadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.Metadata buildPartial() {
+      com.google.api.Metadata result = new com.google.api.Metadata(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.productName_ = productName_;
+      result.productUri_ = productUri_;
+      result.packageName_ = packageName_;
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        packageNamespace_ = packageNamespace_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
+      }
+      result.packageNamespace_ = packageNamespace_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.Metadata) {
+        return mergeFrom((com.google.api.Metadata)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.Metadata other) {
+      if (other == com.google.api.Metadata.getDefaultInstance()) return this;
+      if (!other.getProductName().isEmpty()) {
+        productName_ = other.productName_;
+        onChanged();
+      }
+      if (!other.getProductUri().isEmpty()) {
+        productUri_ = other.productUri_;
+        onChanged();
+      }
+      if (!other.getPackageName().isEmpty()) {
+        packageName_ = other.packageName_;
+        onChanged();
+      }
+      if (!other.packageNamespace_.isEmpty()) {
+        if (packageNamespace_.isEmpty()) {
+          packageNamespace_ = other.packageNamespace_;
+          bitField0_ = (bitField0_ & ~0x00000008);
+        } else {
+          ensurePackageNamespaceIsMutable();
+          packageNamespace_.addAll(other.packageNamespace_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.Metadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Metadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object productName_ = "";
+    /**
+     * <pre>
+     * The name of the product.
+     * This should be set to the colloquial name of the API, and is used
+     * for things such as determining the package name. If not set, it is
+     * inferred based on the final proto package segment before the version.
+     * Specify this in appropriate title casing, with space as the word
+     * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+     * This value may be used as-is in documentation, and code generators should
+     * normalize it appropriately for idiomatic package, module, etc. names in
+     * their language. However, this value is superseded by the language specific
+     * options introduced for some languages.
+     * </pre>
+     *
+     * <code>string product_name = 1;</code>
+     */
+    public java.lang.String getProductName() {
+      java.lang.Object ref = productName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        productName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The name of the product.
+     * This should be set to the colloquial name of the API, and is used
+     * for things such as determining the package name. If not set, it is
+     * inferred based on the final proto package segment before the version.
+     * Specify this in appropriate title casing, with space as the word
+     * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+     * This value may be used as-is in documentation, and code generators should
+     * normalize it appropriately for idiomatic package, module, etc. names in
+     * their language. However, this value is superseded by the language specific
+     * options introduced for some languages.
+     * </pre>
+     *
+     * <code>string product_name = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getProductNameBytes() {
+      java.lang.Object ref = productName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        productName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The name of the product.
+     * This should be set to the colloquial name of the API, and is used
+     * for things such as determining the package name. If not set, it is
+     * inferred based on the final proto package segment before the version.
+     * Specify this in appropriate title casing, with space as the word
+     * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+     * This value may be used as-is in documentation, and code generators should
+     * normalize it appropriately for idiomatic package, module, etc. names in
+     * their language. However, this value is superseded by the language specific
+     * options introduced for some languages.
+     * </pre>
+     *
+     * <code>string product_name = 1;</code>
+     */
+    public Builder setProductName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      productName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The name of the product.
+     * This should be set to the colloquial name of the API, and is used
+     * for things such as determining the package name. If not set, it is
+     * inferred based on the final proto package segment before the version.
+     * Specify this in appropriate title casing, with space as the word
+     * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+     * This value may be used as-is in documentation, and code generators should
+     * normalize it appropriately for idiomatic package, module, etc. names in
+     * their language. However, this value is superseded by the language specific
+     * options introduced for some languages.
+     * </pre>
+     *
+     * <code>string product_name = 1;</code>
+     */
+    public Builder clearProductName() {
+      
+      productName_ = getDefaultInstance().getProductName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The name of the product.
+     * This should be set to the colloquial name of the API, and is used
+     * for things such as determining the package name. If not set, it is
+     * inferred based on the final proto package segment before the version.
+     * Specify this in appropriate title casing, with space as the word
+     * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+     * This value may be used as-is in documentation, and code generators should
+     * normalize it appropriately for idiomatic package, module, etc. names in
+     * their language. However, this value is superseded by the language specific
+     * options introduced for some languages.
+     * </pre>
+     *
+     * <code>string product_name = 1;</code>
+     */
+    public Builder setProductNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      productName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object productUri_ = "";
+    /**
+     * <pre>
+     * The URI for this product.
+     * This may be used in documentation and package metadata.
+     * </pre>
+     *
+     * <code>string product_uri = 2;</code>
+     */
+    public java.lang.String getProductUri() {
+      java.lang.Object ref = productUri_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        productUri_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The URI for this product.
+     * This may be used in documentation and package metadata.
+     * </pre>
+     *
+     * <code>string product_uri = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getProductUriBytes() {
+      java.lang.Object ref = productUri_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        productUri_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The URI for this product.
+     * This may be used in documentation and package metadata.
+     * </pre>
+     *
+     * <code>string product_uri = 2;</code>
+     */
+    public Builder setProductUri(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      productUri_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The URI for this product.
+     * This may be used in documentation and package metadata.
+     * </pre>
+     *
+     * <code>string product_uri = 2;</code>
+     */
+    public Builder clearProductUri() {
+      
+      productUri_ = getDefaultInstance().getProductUri();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The URI for this product.
+     * This may be used in documentation and package metadata.
+     * </pre>
+     *
+     * <code>string product_uri = 2;</code>
+     */
+    public Builder setProductUriBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      productUri_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object packageName_ = "";
+    /**
+     * <pre>
+     * The name of the client library package, if it differs from the
+     * product name.
+     * </pre>
+     *
+     * <code>string package_name = 3;</code>
+     */
+    public java.lang.String getPackageName() {
+      java.lang.Object ref = packageName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        packageName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The name of the client library package, if it differs from the
+     * product name.
+     * </pre>
+     *
+     * <code>string package_name = 3;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPackageNameBytes() {
+      java.lang.Object ref = packageName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        packageName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The name of the client library package, if it differs from the
+     * product name.
+     * </pre>
+     *
+     * <code>string package_name = 3;</code>
+     */
+    public Builder setPackageName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      packageName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The name of the client library package, if it differs from the
+     * product name.
+     * </pre>
+     *
+     * <code>string package_name = 3;</code>
+     */
+    public Builder clearPackageName() {
+      
+      packageName_ = getDefaultInstance().getPackageName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The name of the client library package, if it differs from the
+     * product name.
+     * </pre>
+     *
+     * <code>string package_name = 3;</code>
+     */
+    public Builder setPackageNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      packageName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.LazyStringList packageNamespace_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensurePackageNamespaceIsMutable() {
+      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+        packageNamespace_ = new com.google.protobuf.LazyStringArrayList(packageNamespace_);
+        bitField0_ |= 0x00000008;
+       }
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public com.google.protobuf.ProtocolStringList
+        getPackageNamespaceList() {
+      return packageNamespace_.getUnmodifiableView();
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public int getPackageNamespaceCount() {
+      return packageNamespace_.size();
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public java.lang.String getPackageNamespace(int index) {
+      return packageNamespace_.get(index);
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPackageNamespaceBytes(int index) {
+      return packageNamespace_.getByteString(index);
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public Builder setPackageNamespace(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensurePackageNamespaceIsMutable();
+      packageNamespace_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public Builder addPackageNamespace(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensurePackageNamespaceIsMutable();
+      packageNamespace_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public Builder addAllPackageNamespace(
+        java.lang.Iterable<java.lang.String> values) {
+      ensurePackageNamespaceIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, packageNamespace_);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public Builder clearPackageNamespace() {
+      packageNamespace_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The namespace.
+     * This should be set to the package namespace, using appropriate title
+     * casing. Translators should normalize it appropriately for package, module,
+     * etc. names in their language.
+     * If not set, this is inferred from the proto package (all segments
+     * prior to the segment that determines `api_name`).
+     * </pre>
+     *
+     * <code>repeated string package_namespace = 4;</code>
+     */
+    public Builder addPackageNamespaceBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensurePackageNamespaceIsMutable();
+      packageNamespace_.add(value);
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.Metadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.Metadata)
+  private static final com.google.api.Metadata DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.Metadata();
+  }
+
+  public static com.google.api.Metadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<Metadata>
+      PARSER = new com.google.protobuf.AbstractParser<Metadata>() {
+    @java.lang.Override
+    public Metadata parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Metadata(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<Metadata> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<Metadata> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.Metadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetadataOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetadataOrBuilder.java
new file mode 100644
index 000000000..c3722283a
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetadataOrBuilder.java
@@ -0,0 +1,140 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/metadata.proto
+
+package com.google.api;
+
+public interface MetadataOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.Metadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The name of the product.
+   * This should be set to the colloquial name of the API, and is used
+   * for things such as determining the package name. If not set, it is
+   * inferred based on the final proto package segment before the version.
+   * Specify this in appropriate title casing, with space as the word
+   * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+   * This value may be used as-is in documentation, and code generators should
+   * normalize it appropriately for idiomatic package, module, etc. names in
+   * their language. However, this value is superseded by the language specific
+   * options introduced for some languages.
+   * </pre>
+   *
+   * <code>string product_name = 1;</code>
+   */
+  java.lang.String getProductName();
+  /**
+   * <pre>
+   * The name of the product.
+   * This should be set to the colloquial name of the API, and is used
+   * for things such as determining the package name. If not set, it is
+   * inferred based on the final proto package segment before the version.
+   * Specify this in appropriate title casing, with space as the word
+   * separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+   * This value may be used as-is in documentation, and code generators should
+   * normalize it appropriately for idiomatic package, module, etc. names in
+   * their language. However, this value is superseded by the language specific
+   * options introduced for some languages.
+   * </pre>
+   *
+   * <code>string product_name = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getProductNameBytes();
+
+  /**
+   * <pre>
+   * The URI for this product.
+   * This may be used in documentation and package metadata.
+   * </pre>
+   *
+   * <code>string product_uri = 2;</code>
+   */
+  java.lang.String getProductUri();
+  /**
+   * <pre>
+   * The URI for this product.
+   * This may be used in documentation and package metadata.
+   * </pre>
+   *
+   * <code>string product_uri = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getProductUriBytes();
+
+  /**
+   * <pre>
+   * The name of the client library package, if it differs from the
+   * product name.
+   * </pre>
+   *
+   * <code>string package_name = 3;</code>
+   */
+  java.lang.String getPackageName();
+  /**
+   * <pre>
+   * The name of the client library package, if it differs from the
+   * product name.
+   * </pre>
+   *
+   * <code>string package_name = 3;</code>
+   */
+  com.google.protobuf.ByteString
+      getPackageNameBytes();
+
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  java.util.List<java.lang.String>
+      getPackageNamespaceList();
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  int getPackageNamespaceCount();
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  java.lang.String getPackageNamespace(int index);
+  /**
+   * <pre>
+   * The namespace.
+   * This should be set to the package namespace, using appropriate title
+   * casing. Translators should normalize it appropriately for package, module,
+   * etc. names in their language.
+   * If not set, this is inferred from the proto package (all segments
+   * prior to the segment that determines `api_name`).
+   * </pre>
+   *
+   * <code>repeated string package_namespace = 4;</code>
+   */
+  com.google.protobuf.ByteString
+      getPackageNamespaceBytes(int index);
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetadataProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetadataProto.java
new file mode 100644
index 000000000..216a4d94b
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetadataProto.java
@@ -0,0 +1,74 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/metadata.proto
+
+package com.google.api;
+
+public final class MetadataProto {
+  private MetadataProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_api_Metadata_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_api_Metadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_api_OAuth_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_api_OAuth_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\031google/api/metadata.proto\022\ngoogle.api\032" +
+      " google/protobuf/descriptor.proto\"f\n\010Met" +
+      "adata\022\024\n\014product_name\030\001 \001(\t\022\023\n\013product_u" +
+      "ri\030\002 \001(\t\022\024\n\014package_name\030\003 \001(\t\022\031\n\021packag" +
+      "e_namespace\030\004 \003(\t\"\027\n\005OAuth\022\016\n\006scopes\030\001 \003" +
+      "(\tBd\n\016com.google.apiB\rMetadataProtoP\001ZAg" +
+      "oogle.golang.org/genproto/googleapis/api" +
+      "/annotations;annotationsb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.protobuf.DescriptorProtos.getDescriptor(),
+        }, assigner);
+    internal_static_google_api_Metadata_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_api_Metadata_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_api_Metadata_descriptor,
+        new java.lang.String[] { "ProductName", "ProductUri", "PackageName", "PackageNamespace", });
+    internal_static_google_api_OAuth_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_api_OAuth_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_api_OAuth_descriptor,
+        new java.lang.String[] { "Scopes", });
+    com.google.protobuf.DescriptorProtos.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MethodSignature.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MethodSignature.java
new file mode 100644
index 000000000..f37ca73aa
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MethodSignature.java
@@ -0,0 +1,1259 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/signature.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * A definition of a client library method signature.
+ * </pre>
+ *
+ * Protobuf type {@code google.api.MethodSignature}
+ */
+public  final class MethodSignature extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.MethodSignature)
+    MethodSignatureOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use MethodSignature.newBuilder() to construct.
+  private MethodSignature(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private MethodSignature() {
+    fields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    functionName_ = "";
+    additionalSignatures_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private MethodSignature(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              fields_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            fields_.add(s);
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            functionName_ = s;
+            break;
+          }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              additionalSignatures_ = new java.util.ArrayList<com.google.api.MethodSignature>();
+              mutable_bitField0_ |= 0x00000004;
+            }
+            additionalSignatures_.add(
+                input.readMessage(com.google.api.MethodSignature.parser(), extensionRegistry));
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        fields_ = fields_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+        additionalSignatures_ = java.util.Collections.unmodifiableList(additionalSignatures_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.SignatureProto.internal_static_google_api_MethodSignature_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.SignatureProto.internal_static_google_api_MethodSignature_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.MethodSignature.class, com.google.api.MethodSignature.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int FIELDS_FIELD_NUMBER = 1;
+  private com.google.protobuf.LazyStringList fields_;
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  public com.google.protobuf.ProtocolStringList
+      getFieldsList() {
+    return fields_;
+  }
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  public int getFieldsCount() {
+    return fields_.size();
+  }
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  public java.lang.String getFields(int index) {
+    return fields_.get(index);
+  }
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getFieldsBytes(int index) {
+    return fields_.getByteString(index);
+  }
+
+  public static final int FUNCTION_NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object functionName_;
+  /**
+   * <pre>
+   * The name of the function, if it should intentionally differ from the
+   * name of the RPC.
+   * </pre>
+   *
+   * <code>string function_name = 2;</code>
+   */
+  public java.lang.String getFunctionName() {
+    java.lang.Object ref = functionName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      functionName_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The name of the function, if it should intentionally differ from the
+   * name of the RPC.
+   * </pre>
+   *
+   * <code>string function_name = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getFunctionNameBytes() {
+    java.lang.Object ref = functionName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      functionName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int ADDITIONAL_SIGNATURES_FIELD_NUMBER = 3;
+  private java.util.List<com.google.api.MethodSignature> additionalSignatures_;
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  public java.util.List<com.google.api.MethodSignature> getAdditionalSignaturesList() {
+    return additionalSignatures_;
+  }
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  public java.util.List<? extends com.google.api.MethodSignatureOrBuilder> 
+      getAdditionalSignaturesOrBuilderList() {
+    return additionalSignatures_;
+  }
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  public int getAdditionalSignaturesCount() {
+    return additionalSignatures_.size();
+  }
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  public com.google.api.MethodSignature getAdditionalSignatures(int index) {
+    return additionalSignatures_.get(index);
+  }
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  public com.google.api.MethodSignatureOrBuilder getAdditionalSignaturesOrBuilder(
+      int index) {
+    return additionalSignatures_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < fields_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, fields_.getRaw(i));
+    }
+    if (!getFunctionNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, functionName_);
+    }
+    for (int i = 0; i < additionalSignatures_.size(); i++) {
+      output.writeMessage(3, additionalSignatures_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < fields_.size(); i++) {
+        dataSize += computeStringSizeNoTag(fields_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getFieldsList().size();
+    }
+    if (!getFunctionNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, functionName_);
+    }
+    for (int i = 0; i < additionalSignatures_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, additionalSignatures_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.MethodSignature)) {
+      return super.equals(obj);
+    }
+    com.google.api.MethodSignature other = (com.google.api.MethodSignature) obj;
+
+    boolean result = true;
+    result = result && getFieldsList()
+        .equals(other.getFieldsList());
+    result = result && getFunctionName()
+        .equals(other.getFunctionName());
+    result = result && getAdditionalSignaturesList()
+        .equals(other.getAdditionalSignaturesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getFieldsCount() > 0) {
+      hash = (37 * hash) + FIELDS_FIELD_NUMBER;
+      hash = (53 * hash) + getFieldsList().hashCode();
+    }
+    hash = (37 * hash) + FUNCTION_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getFunctionName().hashCode();
+    if (getAdditionalSignaturesCount() > 0) {
+      hash = (37 * hash) + ADDITIONAL_SIGNATURES_FIELD_NUMBER;
+      hash = (53 * hash) + getAdditionalSignaturesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.MethodSignature parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.MethodSignature parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.MethodSignature parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.MethodSignature parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.MethodSignature parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.MethodSignature parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.MethodSignature prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * A definition of a client library method signature.
+   * </pre>
+   *
+   * Protobuf type {@code google.api.MethodSignature}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.MethodSignature)
+      com.google.api.MethodSignatureOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.SignatureProto.internal_static_google_api_MethodSignature_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.SignatureProto.internal_static_google_api_MethodSignature_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.MethodSignature.class, com.google.api.MethodSignature.Builder.class);
+    }
+
+    // Construct using com.google.api.MethodSignature.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getAdditionalSignaturesFieldBuilder();
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      fields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      functionName_ = "";
+
+      if (additionalSignaturesBuilder_ == null) {
+        additionalSignatures_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      } else {
+        additionalSignaturesBuilder_.clear();
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.SignatureProto.internal_static_google_api_MethodSignature_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.MethodSignature getDefaultInstanceForType() {
+      return com.google.api.MethodSignature.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.MethodSignature build() {
+      com.google.api.MethodSignature result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.MethodSignature buildPartial() {
+      com.google.api.MethodSignature result = new com.google.api.MethodSignature(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        fields_ = fields_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.fields_ = fields_;
+      result.functionName_ = functionName_;
+      if (additionalSignaturesBuilder_ == null) {
+        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+          additionalSignatures_ = java.util.Collections.unmodifiableList(additionalSignatures_);
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.additionalSignatures_ = additionalSignatures_;
+      } else {
+        result.additionalSignatures_ = additionalSignaturesBuilder_.build();
+      }
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.MethodSignature) {
+        return mergeFrom((com.google.api.MethodSignature)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.MethodSignature other) {
+      if (other == com.google.api.MethodSignature.getDefaultInstance()) return this;
+      if (!other.fields_.isEmpty()) {
+        if (fields_.isEmpty()) {
+          fields_ = other.fields_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureFieldsIsMutable();
+          fields_.addAll(other.fields_);
+        }
+        onChanged();
+      }
+      if (!other.getFunctionName().isEmpty()) {
+        functionName_ = other.functionName_;
+        onChanged();
+      }
+      if (additionalSignaturesBuilder_ == null) {
+        if (!other.additionalSignatures_.isEmpty()) {
+          if (additionalSignatures_.isEmpty()) {
+            additionalSignatures_ = other.additionalSignatures_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureAdditionalSignaturesIsMutable();
+            additionalSignatures_.addAll(other.additionalSignatures_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.additionalSignatures_.isEmpty()) {
+          if (additionalSignaturesBuilder_.isEmpty()) {
+            additionalSignaturesBuilder_.dispose();
+            additionalSignaturesBuilder_ = null;
+            additionalSignatures_ = other.additionalSignatures_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+            additionalSignaturesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getAdditionalSignaturesFieldBuilder() : null;
+          } else {
+            additionalSignaturesBuilder_.addAllMessages(other.additionalSignatures_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.MethodSignature parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MethodSignature) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringList fields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureFieldsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        fields_ = new com.google.protobuf.LazyStringArrayList(fields_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public com.google.protobuf.ProtocolStringList
+        getFieldsList() {
+      return fields_.getUnmodifiableView();
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public int getFieldsCount() {
+      return fields_.size();
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public java.lang.String getFields(int index) {
+      return fields_.get(index);
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getFieldsBytes(int index) {
+      return fields_.getByteString(index);
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public Builder setFields(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureFieldsIsMutable();
+      fields_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public Builder addFields(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureFieldsIsMutable();
+      fields_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public Builder addAllFields(
+        java.lang.Iterable<java.lang.String> values) {
+      ensureFieldsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, fields_);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public Builder clearFields() {
+      fields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The list of fields which are considered to be part of the signature,
+     * in the order in which they are expected to appear.
+     * </pre>
+     *
+     * <code>repeated string fields = 1;</code>
+     */
+    public Builder addFieldsBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureFieldsIsMutable();
+      fields_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object functionName_ = "";
+    /**
+     * <pre>
+     * The name of the function, if it should intentionally differ from the
+     * name of the RPC.
+     * </pre>
+     *
+     * <code>string function_name = 2;</code>
+     */
+    public java.lang.String getFunctionName() {
+      java.lang.Object ref = functionName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        functionName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The name of the function, if it should intentionally differ from the
+     * name of the RPC.
+     * </pre>
+     *
+     * <code>string function_name = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getFunctionNameBytes() {
+      java.lang.Object ref = functionName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        functionName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The name of the function, if it should intentionally differ from the
+     * name of the RPC.
+     * </pre>
+     *
+     * <code>string function_name = 2;</code>
+     */
+    public Builder setFunctionName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      functionName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The name of the function, if it should intentionally differ from the
+     * name of the RPC.
+     * </pre>
+     *
+     * <code>string function_name = 2;</code>
+     */
+    public Builder clearFunctionName() {
+      
+      functionName_ = getDefaultInstance().getFunctionName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The name of the function, if it should intentionally differ from the
+     * name of the RPC.
+     * </pre>
+     *
+     * <code>string function_name = 2;</code>
+     */
+    public Builder setFunctionNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      functionName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List<com.google.api.MethodSignature> additionalSignatures_ =
+      java.util.Collections.emptyList();
+    private void ensureAdditionalSignaturesIsMutable() {
+      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+        additionalSignatures_ = new java.util.ArrayList<com.google.api.MethodSignature>(additionalSignatures_);
+        bitField0_ |= 0x00000004;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.api.MethodSignature, com.google.api.MethodSignature.Builder, com.google.api.MethodSignatureOrBuilder> additionalSignaturesBuilder_;
+
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public java.util.List<com.google.api.MethodSignature> getAdditionalSignaturesList() {
+      if (additionalSignaturesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(additionalSignatures_);
+      } else {
+        return additionalSignaturesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public int getAdditionalSignaturesCount() {
+      if (additionalSignaturesBuilder_ == null) {
+        return additionalSignatures_.size();
+      } else {
+        return additionalSignaturesBuilder_.getCount();
+      }
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public com.google.api.MethodSignature getAdditionalSignatures(int index) {
+      if (additionalSignaturesBuilder_ == null) {
+        return additionalSignatures_.get(index);
+      } else {
+        return additionalSignaturesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder setAdditionalSignatures(
+        int index, com.google.api.MethodSignature value) {
+      if (additionalSignaturesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.set(index, value);
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder setAdditionalSignatures(
+        int index, com.google.api.MethodSignature.Builder builderForValue) {
+      if (additionalSignaturesBuilder_ == null) {
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder addAdditionalSignatures(com.google.api.MethodSignature value) {
+      if (additionalSignaturesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.add(value);
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder addAdditionalSignatures(
+        int index, com.google.api.MethodSignature value) {
+      if (additionalSignaturesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.add(index, value);
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder addAdditionalSignatures(
+        com.google.api.MethodSignature.Builder builderForValue) {
+      if (additionalSignaturesBuilder_ == null) {
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.add(builderForValue.build());
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder addAdditionalSignatures(
+        int index, com.google.api.MethodSignature.Builder builderForValue) {
+      if (additionalSignaturesBuilder_ == null) {
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder addAllAdditionalSignatures(
+        java.lang.Iterable<? extends com.google.api.MethodSignature> values) {
+      if (additionalSignaturesBuilder_ == null) {
+        ensureAdditionalSignaturesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, additionalSignatures_);
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder clearAdditionalSignatures() {
+      if (additionalSignaturesBuilder_ == null) {
+        additionalSignatures_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public Builder removeAdditionalSignatures(int index) {
+      if (additionalSignaturesBuilder_ == null) {
+        ensureAdditionalSignaturesIsMutable();
+        additionalSignatures_.remove(index);
+        onChanged();
+      } else {
+        additionalSignaturesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public com.google.api.MethodSignature.Builder getAdditionalSignaturesBuilder(
+        int index) {
+      return getAdditionalSignaturesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public com.google.api.MethodSignatureOrBuilder getAdditionalSignaturesOrBuilder(
+        int index) {
+      if (additionalSignaturesBuilder_ == null) {
+        return additionalSignatures_.get(index);  } else {
+        return additionalSignaturesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public java.util.List<? extends com.google.api.MethodSignatureOrBuilder> 
+         getAdditionalSignaturesOrBuilderList() {
+      if (additionalSignaturesBuilder_ != null) {
+        return additionalSignaturesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(additionalSignatures_);
+      }
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public com.google.api.MethodSignature.Builder addAdditionalSignaturesBuilder() {
+      return getAdditionalSignaturesFieldBuilder().addBuilder(
+          com.google.api.MethodSignature.getDefaultInstance());
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public com.google.api.MethodSignature.Builder addAdditionalSignaturesBuilder(
+        int index) {
+      return getAdditionalSignaturesFieldBuilder().addBuilder(
+          index, com.google.api.MethodSignature.getDefaultInstance());
+    }
+    /**
+     * <pre>
+     * Additional signatures also applicable to the method.
+     * </pre>
+     *
+     * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+     */
+    public java.util.List<com.google.api.MethodSignature.Builder> 
+         getAdditionalSignaturesBuilderList() {
+      return getAdditionalSignaturesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.api.MethodSignature, com.google.api.MethodSignature.Builder, com.google.api.MethodSignatureOrBuilder> 
+        getAdditionalSignaturesFieldBuilder() {
+      if (additionalSignaturesBuilder_ == null) {
+        additionalSignaturesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.api.MethodSignature, com.google.api.MethodSignature.Builder, com.google.api.MethodSignatureOrBuilder>(
+                additionalSignatures_,
+                ((bitField0_ & 0x00000004) == 0x00000004),
+                getParentForChildren(),
+                isClean());
+        additionalSignatures_ = null;
+      }
+      return additionalSignaturesBuilder_;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.MethodSignature)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.MethodSignature)
+  private static final com.google.api.MethodSignature DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.MethodSignature();
+  }
+
+  public static com.google.api.MethodSignature getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<MethodSignature>
+      PARSER = new com.google.protobuf.AbstractParser<MethodSignature>() {
+    @java.lang.Override
+    public MethodSignature parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new MethodSignature(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<MethodSignature> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<MethodSignature> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.MethodSignature getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MethodSignatureOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MethodSignatureOrBuilder.java
new file mode 100644
index 000000000..433557936
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MethodSignatureOrBuilder.java
@@ -0,0 +1,112 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/signature.proto
+
+package com.google.api;
+
+public interface MethodSignatureOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.MethodSignature)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  java.util.List<java.lang.String>
+      getFieldsList();
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  int getFieldsCount();
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  java.lang.String getFields(int index);
+  /**
+   * <pre>
+   * The list of fields which are considered to be part of the signature,
+   * in the order in which they are expected to appear.
+   * </pre>
+   *
+   * <code>repeated string fields = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getFieldsBytes(int index);
+
+  /**
+   * <pre>
+   * The name of the function, if it should intentionally differ from the
+   * name of the RPC.
+   * </pre>
+   *
+   * <code>string function_name = 2;</code>
+   */
+  java.lang.String getFunctionName();
+  /**
+   * <pre>
+   * The name of the function, if it should intentionally differ from the
+   * name of the RPC.
+   * </pre>
+   *
+   * <code>string function_name = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getFunctionNameBytes();
+
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  java.util.List<com.google.api.MethodSignature> 
+      getAdditionalSignaturesList();
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  com.google.api.MethodSignature getAdditionalSignatures(int index);
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  int getAdditionalSignaturesCount();
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  java.util.List<? extends com.google.api.MethodSignatureOrBuilder> 
+      getAdditionalSignaturesOrBuilderList();
+  /**
+   * <pre>
+   * Additional signatures also applicable to the method.
+   * </pre>
+   *
+   * <code>repeated .google.api.MethodSignature additional_signatures = 3;</code>
+   */
+  com.google.api.MethodSignatureOrBuilder getAdditionalSignaturesOrBuilder(
+      int index);
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metric.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metric.java
index 65555f84c..61330acdb 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metric.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Metric.java
@@ -48,13 +48,6 @@ private Metric(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
               labels_ = com.google.protobuf.MapField.newMapField(
@@ -74,6 +67,13 @@ private Metric(
             type_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,6 +92,7 @@ private Metric(
   }
 
   @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -102,6 +103,7 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.MetricProto.internal_static_google_api_Metric_fieldAccessorTable
@@ -251,6 +253,7 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -260,6 +263,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -274,6 +278,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -404,6 +409,7 @@ public static com.google.api.Metric parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -411,6 +417,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Metric prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -461,6 +468,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MetricProto.internal_static_google_api_Metric_fieldAccessorTable
@@ -483,6 +491,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = "";
@@ -491,15 +500,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.MetricProto.internal_static_google_api_Metric_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Metric getDefaultInstanceForType() {
       return com.google.api.Metric.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Metric build() {
       com.google.api.Metric result = buildPartial();
       if (!result.isInitialized()) {
@@ -508,6 +520,7 @@ public com.google.api.Metric build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Metric buildPartial() {
       com.google.api.Metric result = new com.google.api.Metric(this);
       int from_bitField0_ = bitField0_;
@@ -520,32 +533,39 @@ public com.google.api.Metric buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Metric) {
         return mergeFrom((com.google.api.Metric)other);
@@ -568,10 +588,12 @@ public Builder mergeFrom(com.google.api.Metric other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -842,11 +864,13 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -868,6 +892,7 @@ public static com.google.api.Metric getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Metric>
       PARSER = new com.google.protobuf.AbstractParser<Metric>() {
+    @java.lang.Override
     public Metric parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -885,6 +910,7 @@ public com.google.protobuf.Parser<Metric> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Metric getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java
index 526bf0001..a99b6675a 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java
@@ -56,13 +56,6 @@ private MetricDescriptor(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -114,6 +107,13 @@ private MetricDescriptor(
             type_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -134,6 +134,7 @@ private MetricDescriptor(
     return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_fieldAccessorTable
@@ -705,6 +706,7 @@ public int getMetricKindValue() {
    * <code>.google.api.MetricDescriptor.MetricKind metric_kind = 3;</code>
    */
   public com.google.api.MetricDescriptor.MetricKind getMetricKind() {
+    @SuppressWarnings("deprecation")
     com.google.api.MetricDescriptor.MetricKind result = com.google.api.MetricDescriptor.MetricKind.valueOf(metricKind_);
     return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
   }
@@ -731,6 +733,7 @@ public int getValueTypeValue() {
    * <code>.google.api.MetricDescriptor.ValueType value_type = 4;</code>
    */
   public com.google.api.MetricDescriptor.ValueType getValueType() {
+    @SuppressWarnings("deprecation")
     com.google.api.MetricDescriptor.ValueType result = com.google.api.MetricDescriptor.ValueType.valueOf(valueType_);
     return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
   }
@@ -970,6 +973,7 @@ public java.lang.String getDisplayName() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -979,6 +983,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1008,6 +1013,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1174,6 +1180,7 @@ public static com.google.api.MetricDescriptor parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1181,6 +1188,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.MetricDescriptor prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1210,6 +1218,7 @@ public static final class Builder extends
       return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_fieldAccessorTable
@@ -1233,6 +1242,7 @@ private void maybeForceBuilderInitialization() {
         getLabelsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1258,15 +1268,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.MetricDescriptor getDefaultInstanceForType() {
       return com.google.api.MetricDescriptor.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.MetricDescriptor build() {
       com.google.api.MetricDescriptor result = buildPartial();
       if (!result.isInitialized()) {
@@ -1275,6 +1288,7 @@ public com.google.api.MetricDescriptor build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.MetricDescriptor buildPartial() {
       com.google.api.MetricDescriptor result = new com.google.api.MetricDescriptor(this);
       int from_bitField0_ = bitField0_;
@@ -1300,32 +1314,39 @@ public com.google.api.MetricDescriptor buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MetricDescriptor) {
         return mergeFrom((com.google.api.MetricDescriptor)other);
@@ -1394,10 +1415,12 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2056,6 +2079,7 @@ public Builder setMetricKindValue(int value) {
      * <code>.google.api.MetricDescriptor.MetricKind metric_kind = 3;</code>
      */
     public com.google.api.MetricDescriptor.MetricKind getMetricKind() {
+      @SuppressWarnings("deprecation")
       com.google.api.MetricDescriptor.MetricKind result = com.google.api.MetricDescriptor.MetricKind.valueOf(metricKind_);
       return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
     }
@@ -2125,6 +2149,7 @@ public Builder setValueTypeValue(int value) {
      * <code>.google.api.MetricDescriptor.ValueType value_type = 4;</code>
      */
     public com.google.api.MetricDescriptor.ValueType getValueType() {
+      @SuppressWarnings("deprecation")
       com.google.api.MetricDescriptor.ValueType result = com.google.api.MetricDescriptor.ValueType.valueOf(valueType_);
       return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
     }
@@ -2696,11 +2721,13 @@ public Builder setDisplayNameBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2722,6 +2749,7 @@ public static com.google.api.MetricDescriptor getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<MetricDescriptor>
       PARSER = new com.google.protobuf.AbstractParser<MetricDescriptor>() {
+    @java.lang.Override
     public MetricDescriptor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2739,6 +2767,7 @@ public com.google.protobuf.Parser<MetricDescriptor> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.MetricDescriptor getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
index f0e64f5eb..7bfbe724f 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
@@ -50,13 +50,6 @@ private MetricRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,6 +69,13 @@ private MetricRule(
                 metricCosts__.getKey(), metricCosts__.getValue());
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,6 +94,7 @@ private MetricRule(
   }
 
   @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -104,6 +105,7 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.QuotaProto.internal_static_google_api_MetricRule_fieldAccessorTable
@@ -265,6 +267,7 @@ public long getMetricCostsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -274,6 +277,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -288,6 +292,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,6 +423,7 @@ public static com.google.api.MetricRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -425,6 +431,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.MetricRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -477,6 +484,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.QuotaProto.internal_static_google_api_MetricRule_fieldAccessorTable
@@ -499,6 +507,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -507,15 +516,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.QuotaProto.internal_static_google_api_MetricRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.MetricRule getDefaultInstanceForType() {
       return com.google.api.MetricRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.MetricRule build() {
       com.google.api.MetricRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -524,6 +536,7 @@ public com.google.api.MetricRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.MetricRule buildPartial() {
       com.google.api.MetricRule result = new com.google.api.MetricRule(this);
       int from_bitField0_ = bitField0_;
@@ -536,32 +549,39 @@ public com.google.api.MetricRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MetricRule) {
         return mergeFrom((com.google.api.MetricRule)other);
@@ -584,10 +604,12 @@ public Builder mergeFrom(com.google.api.MetricRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -879,11 +901,13 @@ public Builder putAllMetricCosts(
           .putAll(values);
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -905,6 +929,7 @@ public static com.google.api.MetricRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<MetricRule>
       PARSER = new com.google.protobuf.AbstractParser<MetricRule>() {
+    @java.lang.Override
     public MetricRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -922,6 +947,7 @@ public com.google.protobuf.Parser<MetricRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.MetricRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
index 5c043dba3..3f7412df5 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
@@ -58,13 +58,6 @@ private MonitoredResource(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -84,6 +77,13 @@ private MonitoredResource(
                 labels__.getKey(), labels__.getValue());
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,6 +102,7 @@ private MonitoredResource(
   }
 
   @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -112,6 +113,7 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResource_fieldAccessorTable
@@ -267,6 +269,7 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -276,6 +279,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTypeBytes().isEmpty()) {
@@ -290,6 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -420,6 +425,7 @@ public static com.google.api.MonitoredResource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,6 +433,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.MonitoredResource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,6 +494,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResource_fieldAccessorTable
@@ -509,6 +517,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = "";
@@ -517,15 +526,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResource_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResource getDefaultInstanceForType() {
       return com.google.api.MonitoredResource.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResource build() {
       com.google.api.MonitoredResource result = buildPartial();
       if (!result.isInitialized()) {
@@ -534,6 +546,7 @@ public com.google.api.MonitoredResource build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResource buildPartial() {
       com.google.api.MonitoredResource result = new com.google.api.MonitoredResource(this);
       int from_bitField0_ = bitField0_;
@@ -546,32 +559,39 @@ public com.google.api.MonitoredResource buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MonitoredResource) {
         return mergeFrom((com.google.api.MonitoredResource)other);
@@ -594,10 +614,12 @@ public Builder mergeFrom(com.google.api.MonitoredResource other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -880,11 +902,13 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -906,6 +930,7 @@ public static com.google.api.MonitoredResource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<MonitoredResource>
       PARSER = new com.google.protobuf.AbstractParser<MonitoredResource>() {
+    @java.lang.Override
     public MonitoredResource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -923,6 +948,7 @@ public com.google.protobuf.Parser<MonitoredResource> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.MonitoredResource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java
index 685f117a9..11dac92ab 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java
@@ -58,13 +58,6 @@ private MonitoredResourceDescriptor(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -98,6 +91,13 @@ private MonitoredResourceDescriptor(
             name_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,6 +118,7 @@ private MonitoredResourceDescriptor(
     return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceDescriptor_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceDescriptor_fieldAccessorTable
@@ -382,6 +383,7 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -391,6 +393,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTypeBytes().isEmpty()) {
@@ -411,6 +414,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -556,6 +560,7 @@ public static com.google.api.MonitoredResourceDescriptor parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -563,6 +568,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.MonitoredResourceDescriptor prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -597,6 +603,7 @@ public static final class Builder extends
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceDescriptor_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceDescriptor_fieldAccessorTable
@@ -620,6 +627,7 @@ private void maybeForceBuilderInitialization() {
         getLabelsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -639,15 +647,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceDescriptor_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResourceDescriptor getDefaultInstanceForType() {
       return com.google.api.MonitoredResourceDescriptor.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResourceDescriptor build() {
       com.google.api.MonitoredResourceDescriptor result = buildPartial();
       if (!result.isInitialized()) {
@@ -656,6 +667,7 @@ public com.google.api.MonitoredResourceDescriptor build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResourceDescriptor buildPartial() {
       com.google.api.MonitoredResourceDescriptor result = new com.google.api.MonitoredResourceDescriptor(this);
       int from_bitField0_ = bitField0_;
@@ -678,32 +690,39 @@ public com.google.api.MonitoredResourceDescriptor buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MonitoredResourceDescriptor) {
         return mergeFrom((com.google.api.MonitoredResourceDescriptor)other);
@@ -762,10 +781,12 @@ public Builder mergeFrom(com.google.api.MonitoredResourceDescriptor other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1543,11 +1564,13 @@ public com.google.api.LabelDescriptor.Builder addLabelsBuilder(
       }
       return labelsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1569,6 +1592,7 @@ public static com.google.api.MonitoredResourceDescriptor getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<MonitoredResourceDescriptor>
       PARSER = new com.google.protobuf.AbstractParser<MonitoredResourceDescriptor>() {
+    @java.lang.Override
     public MonitoredResourceDescriptor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1586,6 +1610,7 @@ public com.google.protobuf.Parser<MonitoredResourceDescriptor> getParserForType(
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.MonitoredResourceDescriptor getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
index d59914577..f1e259ef6 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
@@ -51,13 +51,6 @@ private MonitoredResourceMetadata(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             com.google.protobuf.Struct.Builder subBuilder = null;
             if (systemLabels_ != null) {
@@ -84,6 +77,13 @@ private MonitoredResourceMetadata(
                 userLabels__.getKey(), userLabels__.getValue());
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,6 +102,7 @@ private MonitoredResourceMetadata(
   }
 
   @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -112,6 +113,7 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceMetadata_fieldAccessorTable
@@ -273,6 +275,7 @@ public java.lang.String getUserLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -282,6 +285,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (systemLabels_ != null) {
@@ -296,6 +300,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -432,6 +437,7 @@ public static com.google.api.MonitoredResourceMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -439,6 +445,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.MonitoredResourceMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -493,6 +500,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceMetadata_fieldAccessorTable
@@ -515,6 +523,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (systemLabelsBuilder_ == null) {
@@ -527,15 +536,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.MonitoredResourceProto.internal_static_google_api_MonitoredResourceMetadata_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResourceMetadata getDefaultInstanceForType() {
       return com.google.api.MonitoredResourceMetadata.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResourceMetadata build() {
       com.google.api.MonitoredResourceMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,6 +556,7 @@ public com.google.api.MonitoredResourceMetadata build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.MonitoredResourceMetadata buildPartial() {
       com.google.api.MonitoredResourceMetadata result = new com.google.api.MonitoredResourceMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -560,32 +573,39 @@ public com.google.api.MonitoredResourceMetadata buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MonitoredResourceMetadata) {
         return mergeFrom((com.google.api.MonitoredResourceMetadata)other);
@@ -607,10 +627,12 @@ public Builder mergeFrom(com.google.api.MonitoredResourceMetadata other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1014,11 +1036,13 @@ public Builder putAllUserLabels(
           .putAll(values);
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1040,6 +1064,7 @@ public static com.google.api.MonitoredResourceMetadata getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<MonitoredResourceMetadata>
       PARSER = new com.google.protobuf.AbstractParser<MonitoredResourceMetadata>() {
+    @java.lang.Override
     public MonitoredResourceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1057,6 +1082,7 @@ public com.google.protobuf.Parser<MonitoredResourceMetadata> getParserForType()
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.MonitoredResourceMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
index 0cc4aa90f..65c032645 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
@@ -82,13 +82,6 @@ private Monitoring(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               producerDestinations_ = new java.util.ArrayList<com.google.api.Monitoring.MonitoringDestination>();
@@ -107,6 +100,13 @@ private Monitoring(
                 input.readMessage(com.google.api.Monitoring.MonitoringDestination.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -130,6 +130,7 @@ private Monitoring(
     return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_fieldAccessorTable
@@ -246,13 +247,6 @@ private MonitoringDestination(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -268,6 +262,13 @@ private MonitoringDestination(
               metrics_.add(s);
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -288,6 +289,7 @@ private MonitoringDestination(
       return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_MonitoringDestination_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_MonitoringDestination_fieldAccessorTable
@@ -390,6 +392,7 @@ public java.lang.String getMetrics(int index) {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -399,6 +402,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getMonitoredResourceBytes().isEmpty()) {
@@ -410,6 +414,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -538,6 +543,7 @@ public static com.google.api.Monitoring.MonitoringDestination parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -545,6 +551,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.api.Monitoring.MonitoringDestination prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -573,6 +580,7 @@ public static final class Builder extends
         return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_MonitoringDestination_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_MonitoringDestination_fieldAccessorTable
@@ -595,6 +603,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         monitoredResource_ = "";
@@ -604,15 +613,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_MonitoringDestination_descriptor;
       }
 
+      @java.lang.Override
       public com.google.api.Monitoring.MonitoringDestination getDefaultInstanceForType() {
         return com.google.api.Monitoring.MonitoringDestination.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.api.Monitoring.MonitoringDestination build() {
         com.google.api.Monitoring.MonitoringDestination result = buildPartial();
         if (!result.isInitialized()) {
@@ -621,6 +633,7 @@ public com.google.api.Monitoring.MonitoringDestination build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.api.Monitoring.MonitoringDestination buildPartial() {
         com.google.api.Monitoring.MonitoringDestination result = new com.google.api.Monitoring.MonitoringDestination(this);
         int from_bitField0_ = bitField0_;
@@ -636,32 +649,39 @@ public com.google.api.Monitoring.MonitoringDestination buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Monitoring.MonitoringDestination) {
           return mergeFrom((com.google.api.Monitoring.MonitoringDestination)other);
@@ -692,10 +712,12 @@ public Builder mergeFrom(com.google.api.Monitoring.MonitoringDestination other)
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -947,11 +969,13 @@ public Builder addMetricsBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -973,6 +997,7 @@ public static com.google.api.Monitoring.MonitoringDestination getDefaultInstance
 
     private static final com.google.protobuf.Parser<MonitoringDestination>
         PARSER = new com.google.protobuf.AbstractParser<MonitoringDestination>() {
+      @java.lang.Override
       public MonitoringDestination parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -990,6 +1015,7 @@ public com.google.protobuf.Parser<MonitoringDestination> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.api.Monitoring.MonitoringDestination getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1137,6 +1163,7 @@ public com.google.api.Monitoring.MonitoringDestinationOrBuilder getConsumerDesti
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1146,6 +1173,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < producerDestinations_.size(); i++) {
@@ -1157,6 +1185,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1284,6 +1313,7 @@ public static com.google.api.Monitoring parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1291,6 +1321,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Monitoring prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1352,6 +1383,7 @@ public static final class Builder extends
       return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_fieldAccessorTable
@@ -1376,6 +1408,7 @@ private void maybeForceBuilderInitialization() {
         getConsumerDestinationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (producerDestinationsBuilder_ == null) {
@@ -1393,15 +1426,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Monitoring getDefaultInstanceForType() {
       return com.google.api.Monitoring.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Monitoring build() {
       com.google.api.Monitoring result = buildPartial();
       if (!result.isInitialized()) {
@@ -1410,6 +1446,7 @@ public com.google.api.Monitoring build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Monitoring buildPartial() {
       com.google.api.Monitoring result = new com.google.api.Monitoring(this);
       int from_bitField0_ = bitField0_;
@@ -1435,32 +1472,39 @@ public com.google.api.Monitoring buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Monitoring) {
         return mergeFrom((com.google.api.Monitoring)other);
@@ -1529,10 +1573,12 @@ public Builder mergeFrom(com.google.api.Monitoring other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2283,11 +2329,13 @@ public com.google.api.Monitoring.MonitoringDestination.Builder addConsumerDestin
       }
       return consumerDestinationsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2309,6 +2357,7 @@ public static com.google.api.Monitoring getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Monitoring>
       PARSER = new com.google.protobuf.AbstractParser<Monitoring>() {
+    @java.lang.Override
     public Monitoring parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2326,6 +2375,7 @@ public com.google.protobuf.Parser<Monitoring> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Monitoring getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuth.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuth.java
new file mode 100644
index 000000000..13a3ac086
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuth.java
@@ -0,0 +1,672 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/metadata.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * Information about OAuth.
+ * </pre>
+ *
+ * Protobuf type {@code google.api.OAuth}
+ */
+public  final class OAuth extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.OAuth)
+    OAuthOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use OAuth.newBuilder() to construct.
+  private OAuth(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private OAuth() {
+    scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private OAuth(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              scopes_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            scopes_.add(s);
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        scopes_ = scopes_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.MetadataProto.internal_static_google_api_OAuth_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.MetadataProto.internal_static_google_api_OAuth_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.OAuth.class, com.google.api.OAuth.Builder.class);
+  }
+
+  public static final int SCOPES_FIELD_NUMBER = 1;
+  private com.google.protobuf.LazyStringList scopes_;
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  public com.google.protobuf.ProtocolStringList
+      getScopesList() {
+    return scopes_;
+  }
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  public int getScopesCount() {
+    return scopes_.size();
+  }
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  public java.lang.String getScopes(int index) {
+    return scopes_.get(index);
+  }
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getScopesBytes(int index) {
+    return scopes_.getByteString(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < scopes_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, scopes_.getRaw(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < scopes_.size(); i++) {
+        dataSize += computeStringSizeNoTag(scopes_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getScopesList().size();
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.OAuth)) {
+      return super.equals(obj);
+    }
+    com.google.api.OAuth other = (com.google.api.OAuth) obj;
+
+    boolean result = true;
+    result = result && getScopesList()
+        .equals(other.getScopesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getScopesCount() > 0) {
+      hash = (37 * hash) + SCOPES_FIELD_NUMBER;
+      hash = (53 * hash) + getScopesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.OAuth parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.OAuth parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.OAuth parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.OAuth parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.OAuth parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.OAuth parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.OAuth parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.OAuth parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.OAuth parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.OAuth parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.OAuth parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.OAuth parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.OAuth prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * Information about OAuth.
+   * </pre>
+   *
+   * Protobuf type {@code google.api.OAuth}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.OAuth)
+      com.google.api.OAuthOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.MetadataProto.internal_static_google_api_OAuth_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.MetadataProto.internal_static_google_api_OAuth_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.OAuth.class, com.google.api.OAuth.Builder.class);
+    }
+
+    // Construct using com.google.api.OAuth.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.MetadataProto.internal_static_google_api_OAuth_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.OAuth getDefaultInstanceForType() {
+      return com.google.api.OAuth.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.OAuth build() {
+      com.google.api.OAuth result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.OAuth buildPartial() {
+      com.google.api.OAuth result = new com.google.api.OAuth(this);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        scopes_ = scopes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.scopes_ = scopes_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.OAuth) {
+        return mergeFrom((com.google.api.OAuth)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.OAuth other) {
+      if (other == com.google.api.OAuth.getDefaultInstance()) return this;
+      if (!other.scopes_.isEmpty()) {
+        if (scopes_.isEmpty()) {
+          scopes_ = other.scopes_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureScopesIsMutable();
+          scopes_.addAll(other.scopes_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.OAuth parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.OAuth) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringList scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureScopesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        scopes_ = new com.google.protobuf.LazyStringArrayList(scopes_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public com.google.protobuf.ProtocolStringList
+        getScopesList() {
+      return scopes_.getUnmodifiableView();
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public int getScopesCount() {
+      return scopes_.size();
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public java.lang.String getScopes(int index) {
+      return scopes_.get(index);
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getScopesBytes(int index) {
+      return scopes_.getByteString(index);
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public Builder setScopes(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureScopesIsMutable();
+      scopes_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public Builder addScopes(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureScopesIsMutable();
+      scopes_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public Builder addAllScopes(
+        java.lang.Iterable<java.lang.String> values) {
+      ensureScopesIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, scopes_);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public Builder clearScopes() {
+      scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The set of OAuth scopes needed to be able to successfully call any RPC
+     * on the service. These are generally specified as a URL, for example:
+     * "https://www.googleapis.com/auth/cloud-platform"
+     * </pre>
+     *
+     * <code>repeated string scopes = 1;</code>
+     */
+    public Builder addScopesBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureScopesIsMutable();
+      scopes_.add(value);
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.OAuth)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.OAuth)
+  private static final com.google.api.OAuth DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.OAuth();
+  }
+
+  public static com.google.api.OAuth getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<OAuth>
+      PARSER = new com.google.protobuf.AbstractParser<OAuth>() {
+    @java.lang.Override
+    public OAuth parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new OAuth(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<OAuth> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<OAuth> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.OAuth getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthOrBuilder.java
new file mode 100644
index 000000000..c11b08c88
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthOrBuilder.java
@@ -0,0 +1,52 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/metadata.proto
+
+package com.google.api;
+
+public interface OAuthOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.OAuth)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  java.util.List<java.lang.String>
+      getScopesList();
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  int getScopesCount();
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  java.lang.String getScopes(int index);
+  /**
+   * <pre>
+   * The set of OAuth scopes needed to be able to successfully call any RPC
+   * on the service. These are generally specified as a URL, for example:
+   * "https://www.googleapis.com/auth/cloud-platform"
+   * </pre>
+   *
+   * <code>repeated string scopes = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getScopesBytes(int index);
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
index 25c29ac9e..5be1df7bf 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
@@ -60,6 +60,12 @@ private OAuthRequirements(
           case 0:
             done = true;
             break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            canonicalScopes_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -67,12 +73,6 @@ private OAuthRequirements(
             }
             break;
           }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            canonicalScopes_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,6 +90,7 @@ private OAuthRequirements(
     return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_fieldAccessorTable
@@ -148,6 +149,7 @@ public java.lang.String getCanonicalScopes() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,6 +159,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCanonicalScopesBytes().isEmpty()) {
@@ -165,6 +168,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -279,6 +283,7 @@ public static com.google.api.OAuthRequirements parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -286,6 +291,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.OAuthRequirements prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -326,6 +332,7 @@ public static final class Builder extends
       return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_fieldAccessorTable
@@ -348,6 +355,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       canonicalScopes_ = "";
@@ -355,15 +363,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.OAuthRequirements getDefaultInstanceForType() {
       return com.google.api.OAuthRequirements.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.OAuthRequirements build() {
       com.google.api.OAuthRequirements result = buildPartial();
       if (!result.isInitialized()) {
@@ -372,6 +383,7 @@ public com.google.api.OAuthRequirements build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.OAuthRequirements buildPartial() {
       com.google.api.OAuthRequirements result = new com.google.api.OAuthRequirements(this);
       result.canonicalScopes_ = canonicalScopes_;
@@ -379,32 +391,39 @@ public com.google.api.OAuthRequirements buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.OAuthRequirements) {
         return mergeFrom((com.google.api.OAuthRequirements)other);
@@ -425,10 +444,12 @@ public Builder mergeFrom(com.google.api.OAuthRequirements other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -555,11 +576,13 @@ public Builder setCanonicalScopesBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -581,6 +604,7 @@ public static com.google.api.OAuthRequirements getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<OAuthRequirements>
       PARSER = new com.google.protobuf.AbstractParser<OAuthRequirements>() {
+    @java.lang.Override
     public OAuthRequirements parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -598,6 +622,7 @@ public com.google.protobuf.Parser<OAuthRequirements> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.OAuthRequirements getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Organization.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Organization.java
new file mode 100644
index 000000000..330176e95
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Organization.java
@@ -0,0 +1,555 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/annotations.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * A message representing an Organization.
+ * Useful to be able to declare an organization as a referent for another
+ * field.
+ * (See `resources.proto` in this directory.)
+ * </pre>
+ *
+ * Protobuf type {@code google.api.Organization}
+ */
+public  final class Organization extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.Organization)
+    OrganizationOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Organization.newBuilder() to construct.
+  private Organization(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private Organization() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Organization(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.AnnotationsProto.internal_static_google_api_Organization_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.AnnotationsProto.internal_static_google_api_Organization_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.Organization.class, com.google.api.Organization.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.Organization)) {
+      return super.equals(obj);
+    }
+    com.google.api.Organization other = (com.google.api.Organization) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.Organization parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Organization parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Organization parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Organization parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Organization parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Organization parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Organization parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Organization parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Organization parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.Organization parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Organization parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Organization parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.Organization prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * A message representing an Organization.
+   * Useful to be able to declare an organization as a referent for another
+   * field.
+   * (See `resources.proto` in this directory.)
+   * </pre>
+   *
+   * Protobuf type {@code google.api.Organization}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.Organization)
+      com.google.api.OrganizationOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.AnnotationsProto.internal_static_google_api_Organization_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.AnnotationsProto.internal_static_google_api_Organization_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.Organization.class, com.google.api.Organization.Builder.class);
+    }
+
+    // Construct using com.google.api.Organization.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.AnnotationsProto.internal_static_google_api_Organization_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.Organization getDefaultInstanceForType() {
+      return com.google.api.Organization.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.Organization build() {
+      com.google.api.Organization result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.Organization buildPartial() {
+      com.google.api.Organization result = new com.google.api.Organization(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.Organization) {
+        return mergeFrom((com.google.api.Organization)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.Organization other) {
+      if (other == com.google.api.Organization.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.Organization parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Organization) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.Organization)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.Organization)
+  private static final com.google.api.Organization DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.Organization();
+  }
+
+  public static com.google.api.Organization getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<Organization>
+      PARSER = new com.google.protobuf.AbstractParser<Organization>() {
+    @java.lang.Override
+    public Organization parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Organization(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<Organization> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<Organization> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.Organization getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/OrganizationOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OrganizationOrBuilder.java
new file mode 100644
index 000000000..a1538c1aa
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/OrganizationOrBuilder.java
@@ -0,0 +1,19 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/annotations.proto
+
+package com.google.api;
+
+public interface OrganizationOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.Organization)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+   */
+  java.lang.String getName();
+  /**
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Page.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Page.java
index fed15f4a8..e67178c56 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Page.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Page.java
@@ -50,13 +50,6 @@ private Page(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -78,6 +71,13 @@ private Page(
                 input.readMessage(com.google.api.Page.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,6 +98,7 @@ private Page(
     return com.google.api.DocumentationProto.internal_static_google_api_Page_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.DocumentationProto.internal_static_google_api_Page_fieldAccessorTable
@@ -279,6 +280,7 @@ public com.google.api.PageOrBuilder getSubpagesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,6 +290,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -302,6 +305,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -433,6 +437,7 @@ public static com.google.api.Page parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -440,6 +445,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Page prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -468,6 +474,7 @@ public static final class Builder extends
       return com.google.api.DocumentationProto.internal_static_google_api_Page_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.DocumentationProto.internal_static_google_api_Page_fieldAccessorTable
@@ -491,6 +498,7 @@ private void maybeForceBuilderInitialization() {
         getSubpagesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -506,15 +514,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.DocumentationProto.internal_static_google_api_Page_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Page getDefaultInstanceForType() {
       return com.google.api.Page.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Page build() {
       com.google.api.Page result = buildPartial();
       if (!result.isInitialized()) {
@@ -523,6 +534,7 @@ public com.google.api.Page build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Page buildPartial() {
       com.google.api.Page result = new com.google.api.Page(this);
       int from_bitField0_ = bitField0_;
@@ -543,32 +555,39 @@ public com.google.api.Page buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Page) {
         return mergeFrom((com.google.api.Page)other);
@@ -619,10 +638,12 @@ public Builder mergeFrom(com.google.api.Page other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1219,11 +1240,13 @@ public com.google.api.Page.Builder addSubpagesBuilder(
       }
       return subpagesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1245,6 +1268,7 @@ public static com.google.api.Page getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Page>
       PARSER = new com.google.protobuf.AbstractParser<Page>() {
+    @java.lang.Override
     public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1262,6 +1286,7 @@ public com.google.protobuf.Parser<Page> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Page getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthorizationConfig.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Project.java
similarity index 61%
rename from generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthorizationConfig.java
rename to generated/java/proto-google-common-protos/src/main/java/com/google/api/Project.java
index bfd6210d2..7ae1a1284 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthorizationConfig.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Project.java
@@ -1,32 +1,28 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/api/experimental/authorization_config.proto
+// source: google/api/annotations.proto
 
 package com.google.api;
 
 /**
  * <pre>
- * Configuration of authorization.
- * This section determines the authorization provider, if unspecified, then no
- * authorization check will be done.
- * Example:
- *     experimental:
- *       authorization:
- *         provider: firebaserules.googleapis.com
+ * A message representing a Project.
+ * Useful to be able to declare a project as a referent for another field.
+ * (See `resources.proto` in this directory.)
  * </pre>
  *
- * Protobuf type {@code google.api.AuthorizationConfig}
+ * Protobuf type {@code google.api.Project}
  */
-public  final class AuthorizationConfig extends
+public  final class Project extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.api.AuthorizationConfig)
-    AuthorizationConfigOrBuilder {
+    // @@protoc_insertion_point(message_implements:google.api.Project)
+    ProjectOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use AuthorizationConfig.newBuilder() to construct.
-  private AuthorizationConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+  // Use Project.newBuilder() to construct.
+  private Project(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
   }
-  private AuthorizationConfig() {
-    provider_ = "";
+  private Project() {
+    name_ = "";
   }
 
   @java.lang.Override
@@ -34,7 +30,7 @@ private AuthorizationConfig() {
   getUnknownFields() {
     return this.unknownFields;
   }
-  private AuthorizationConfig(
+  private Project(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
@@ -53,6 +49,12 @@ private AuthorizationConfig(
           case 0:
             done = true;
             break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,12 +62,6 @@ private AuthorizationConfig(
             }
             break;
           }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            provider_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -80,54 +76,45 @@ private AuthorizationConfig(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.google.api.AuthorizationConfigProto.internal_static_google_api_AuthorizationConfig_descriptor;
+    return com.google.api.AnnotationsProto.internal_static_google_api_Project_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.api.AuthorizationConfigProto.internal_static_google_api_AuthorizationConfig_fieldAccessorTable
+    return com.google.api.AnnotationsProto.internal_static_google_api_Project_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.api.AuthorizationConfig.class, com.google.api.AuthorizationConfig.Builder.class);
+            com.google.api.Project.class, com.google.api.Project.Builder.class);
   }
 
-  public static final int PROVIDER_FIELD_NUMBER = 1;
-  private volatile java.lang.Object provider_;
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
   /**
-   * <pre>
-   * The name of the authorization provider, such as
-   * firebaserules.googleapis.com.
-   * </pre>
-   *
-   * <code>string provider = 1;</code>
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
    */
-  public java.lang.String getProvider() {
-    java.lang.Object ref = provider_;
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      provider_ = s;
+      name_ = s;
       return s;
     }
   }
   /**
-   * <pre>
-   * The name of the authorization provider, such as
-   * firebaserules.googleapis.com.
-   * </pre>
-   *
-   * <code>string provider = 1;</code>
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
    */
   public com.google.protobuf.ByteString
-      getProviderBytes() {
-    java.lang.Object ref = provider_;
+      getNameBytes() {
+    java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      provider_ = b;
+      name_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
@@ -135,6 +122,7 @@ public java.lang.String getProvider() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,21 +132,23 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (!getProviderBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, provider_);
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (!getProviderBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, provider_);
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -170,14 +160,14 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.google.api.AuthorizationConfig)) {
+    if (!(obj instanceof com.google.api.Project)) {
       return super.equals(obj);
     }
-    com.google.api.AuthorizationConfig other = (com.google.api.AuthorizationConfig) obj;
+    com.google.api.Project other = (com.google.api.Project) obj;
 
     boolean result = true;
-    result = result && getProvider()
-        .equals(other.getProvider());
+    result = result && getName()
+        .equals(other.getName());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -189,76 +179,76 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PROVIDER_FIELD_NUMBER;
-    hash = (53 * hash) + getProvider().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(byte[] data)
+  public static com.google.api.Project parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(java.io.InputStream input)
+  public static com.google.api.Project parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.api.AuthorizationConfig parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.api.Project parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.google.api.AuthorizationConfig parseDelimitedFrom(
+  public static com.google.api.Project parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.api.AuthorizationConfig parseFrom(
+  public static com.google.api.Project parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -266,13 +256,15 @@ public static com.google.api.AuthorizationConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.google.api.AuthorizationConfig prototype) {
+  public static Builder newBuilder(com.google.api.Project prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -286,34 +278,31 @@ protected Builder newBuilderForType(
   }
   /**
    * <pre>
-   * Configuration of authorization.
-   * This section determines the authorization provider, if unspecified, then no
-   * authorization check will be done.
-   * Example:
-   *     experimental:
-   *       authorization:
-   *         provider: firebaserules.googleapis.com
+   * A message representing a Project.
+   * Useful to be able to declare a project as a referent for another field.
+   * (See `resources.proto` in this directory.)
    * </pre>
    *
-   * Protobuf type {@code google.api.AuthorizationConfig}
+   * Protobuf type {@code google.api.Project}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:google.api.AuthorizationConfig)
-      com.google.api.AuthorizationConfigOrBuilder {
+      // @@protoc_insertion_point(builder_implements:google.api.Project)
+      com.google.api.ProjectOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.google.api.AuthorizationConfigProto.internal_static_google_api_AuthorizationConfig_descriptor;
+      return com.google.api.AnnotationsProto.internal_static_google_api_Project_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.api.AuthorizationConfigProto.internal_static_google_api_AuthorizationConfig_fieldAccessorTable
+      return com.google.api.AnnotationsProto.internal_static_google_api_Project_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.api.AuthorizationConfig.class, com.google.api.AuthorizationConfig.Builder.class);
+              com.google.api.Project.class, com.google.api.Project.Builder.class);
     }
 
-    // Construct using com.google.api.AuthorizationConfig.newBuilder()
+    // Construct using com.google.api.Project.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -328,76 +317,88 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
-      provider_ = "";
+      name_ = "";
 
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.google.api.AuthorizationConfigProto.internal_static_google_api_AuthorizationConfig_descriptor;
+      return com.google.api.AnnotationsProto.internal_static_google_api_Project_descriptor;
     }
 
-    public com.google.api.AuthorizationConfig getDefaultInstanceForType() {
-      return com.google.api.AuthorizationConfig.getDefaultInstance();
+    @java.lang.Override
+    public com.google.api.Project getDefaultInstanceForType() {
+      return com.google.api.Project.getDefaultInstance();
     }
 
-    public com.google.api.AuthorizationConfig build() {
-      com.google.api.AuthorizationConfig result = buildPartial();
+    @java.lang.Override
+    public com.google.api.Project build() {
+      com.google.api.Project result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.google.api.AuthorizationConfig buildPartial() {
-      com.google.api.AuthorizationConfig result = new com.google.api.AuthorizationConfig(this);
-      result.provider_ = provider_;
+    @java.lang.Override
+    public com.google.api.Project buildPartial() {
+      com.google.api.Project result = new com.google.api.Project(this);
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.api.AuthorizationConfig) {
-        return mergeFrom((com.google.api.AuthorizationConfig)other);
+      if (other instanceof com.google.api.Project) {
+        return mergeFrom((com.google.api.Project)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.api.AuthorizationConfig other) {
-      if (other == com.google.api.AuthorizationConfig.getDefaultInstance()) return this;
-      if (!other.getProvider().isEmpty()) {
-        provider_ = other.provider_;
+    public Builder mergeFrom(com.google.api.Project other) {
+      if (other == com.google.api.Project.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
         onChanged();
       }
       this.mergeUnknownFields(other.unknownFields);
@@ -405,19 +406,21 @@ public Builder mergeFrom(com.google.api.AuthorizationConfig other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.api.AuthorizationConfig parsedMessage = null;
+      com.google.api.Project parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.api.AuthorizationConfig) e.getUnfinishedMessage();
+        parsedMessage = (com.google.api.Project) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -427,143 +430,122 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object provider_ = "";
+    private java.lang.Object name_ = "";
     /**
-     * <pre>
-     * The name of the authorization provider, such as
-     * firebaserules.googleapis.com.
-     * </pre>
-     *
-     * <code>string provider = 1;</code>
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
      */
-    public java.lang.String getProvider() {
-      java.lang.Object ref = provider_;
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        provider_ = s;
+        name_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
       }
     }
     /**
-     * <pre>
-     * The name of the authorization provider, such as
-     * firebaserules.googleapis.com.
-     * </pre>
-     *
-     * <code>string provider = 1;</code>
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
      */
     public com.google.protobuf.ByteString
-        getProviderBytes() {
-      java.lang.Object ref = provider_;
+        getNameBytes() {
+      java.lang.Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        provider_ = b;
+        name_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
     /**
-     * <pre>
-     * The name of the authorization provider, such as
-     * firebaserules.googleapis.com.
-     * </pre>
-     *
-     * <code>string provider = 1;</code>
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
      */
-    public Builder setProvider(
+    public Builder setName(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      provider_ = value;
+      name_ = value;
       onChanged();
       return this;
     }
     /**
-     * <pre>
-     * The name of the authorization provider, such as
-     * firebaserules.googleapis.com.
-     * </pre>
-     *
-     * <code>string provider = 1;</code>
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
      */
-    public Builder clearProvider() {
+    public Builder clearName() {
       
-      provider_ = getDefaultInstance().getProvider();
+      name_ = getDefaultInstance().getName();
       onChanged();
       return this;
     }
     /**
-     * <pre>
-     * The name of the authorization provider, such as
-     * firebaserules.googleapis.com.
-     * </pre>
-     *
-     * <code>string provider = 1;</code>
+     * <code>string name = 1 [(.google.api.resource) = { ... }</code>
      */
-    public Builder setProviderBytes(
+    public Builder setNameBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      provider_ = value;
+      name_ = value;
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
     }
 
 
-    // @@protoc_insertion_point(builder_scope:google.api.AuthorizationConfig)
+    // @@protoc_insertion_point(builder_scope:google.api.Project)
   }
 
-  // @@protoc_insertion_point(class_scope:google.api.AuthorizationConfig)
-  private static final com.google.api.AuthorizationConfig DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:google.api.Project)
+  private static final com.google.api.Project DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.google.api.AuthorizationConfig();
+    DEFAULT_INSTANCE = new com.google.api.Project();
   }
 
-  public static com.google.api.AuthorizationConfig getDefaultInstance() {
+  public static com.google.api.Project getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser<AuthorizationConfig>
-      PARSER = new com.google.protobuf.AbstractParser<AuthorizationConfig>() {
-    public AuthorizationConfig parsePartialFrom(
+  private static final com.google.protobuf.Parser<Project>
+      PARSER = new com.google.protobuf.AbstractParser<Project>() {
+    @java.lang.Override
+    public Project parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AuthorizationConfig(input, extensionRegistry);
+      return new Project(input, extensionRegistry);
     }
   };
 
-  public static com.google.protobuf.Parser<AuthorizationConfig> parser() {
+  public static com.google.protobuf.Parser<Project> parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser<AuthorizationConfig> getParserForType() {
+  public com.google.protobuf.Parser<Project> getParserForType() {
     return PARSER;
   }
 
-  public com.google.api.AuthorizationConfig getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.api.Project getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectOrBuilder.java
new file mode 100644
index 000000000..44230ae5e
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectOrBuilder.java
@@ -0,0 +1,19 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/annotations.proto
+
+package com.google.api;
+
+public interface ProjectOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.Project)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+   */
+  java.lang.String getName();
+  /**
+   * <code>string name = 1 [(.google.api.resource) = { ... }</code>
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
index f25d17cb3..9c711139d 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
@@ -60,13 +60,6 @@ private ProjectProperties(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               properties_ = new java.util.ArrayList<com.google.api.Property>();
@@ -76,6 +69,13 @@ private ProjectProperties(
                 input.readMessage(com.google.api.Property.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,6 +96,7 @@ private ProjectProperties(
     return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_fieldAccessorTable
@@ -159,6 +160,7 @@ public com.google.api.PropertyOrBuilder getPropertiesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -168,6 +170,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < properties_.size(); i++) {
@@ -176,6 +179,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -293,6 +297,7 @@ public static com.google.api.ProjectProperties parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -300,6 +305,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.ProjectProperties prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -340,6 +346,7 @@ public static final class Builder extends
       return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_fieldAccessorTable
@@ -363,6 +370,7 @@ private void maybeForceBuilderInitialization() {
         getPropertiesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertiesBuilder_ == null) {
@@ -374,15 +382,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.ProjectProperties getDefaultInstanceForType() {
       return com.google.api.ProjectProperties.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.ProjectProperties build() {
       com.google.api.ProjectProperties result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,6 +402,7 @@ public com.google.api.ProjectProperties build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.ProjectProperties buildPartial() {
       com.google.api.ProjectProperties result = new com.google.api.ProjectProperties(this);
       int from_bitField0_ = bitField0_;
@@ -407,32 +419,39 @@ public com.google.api.ProjectProperties buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ProjectProperties) {
         return mergeFrom((com.google.api.ProjectProperties)other);
@@ -475,10 +494,12 @@ public Builder mergeFrom(com.google.api.ProjectProperties other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -809,11 +830,13 @@ public com.google.api.Property.Builder addPropertiesBuilder(
       }
       return propertiesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -835,6 +858,7 @@ public static com.google.api.ProjectProperties getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<ProjectProperties>
       PARSER = new com.google.protobuf.AbstractParser<ProjectProperties>() {
+    @java.lang.Override
     public ProjectProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -852,6 +876,7 @@ public com.google.protobuf.Parser<ProjectProperties> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.ProjectProperties getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Property.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Property.java
index 27d5fbc67..1b630f7d1 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Property.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Property.java
@@ -56,13 +56,6 @@ private Property(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -81,6 +74,13 @@ private Property(
             description_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,6 +98,7 @@ private Property(
     return com.google.api.ConsumerProto.internal_static_google_api_Property_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ConsumerProto.internal_static_google_api_Property_fieldAccessorTable
@@ -336,6 +337,7 @@ public int getTypeValue() {
    * <code>.google.api.Property.PropertyType type = 2;</code>
    */
   public com.google.api.Property.PropertyType getType() {
+    @SuppressWarnings("deprecation")
     com.google.api.Property.PropertyType result = com.google.api.Property.PropertyType.valueOf(type_);
     return result == null ? com.google.api.Property.PropertyType.UNRECOGNIZED : result;
   }
@@ -383,6 +385,7 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -392,6 +395,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -406,6 +410,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -534,6 +539,7 @@ public static com.google.api.Property parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -541,6 +547,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Property prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -575,6 +582,7 @@ public static final class Builder extends
       return com.google.api.ConsumerProto.internal_static_google_api_Property_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ConsumerProto.internal_static_google_api_Property_fieldAccessorTable
@@ -597,6 +605,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -608,15 +617,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ConsumerProto.internal_static_google_api_Property_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Property getDefaultInstanceForType() {
       return com.google.api.Property.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Property build() {
       com.google.api.Property result = buildPartial();
       if (!result.isInitialized()) {
@@ -625,6 +637,7 @@ public com.google.api.Property build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Property buildPartial() {
       com.google.api.Property result = new com.google.api.Property(this);
       result.name_ = name_;
@@ -634,32 +647,39 @@ public com.google.api.Property buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Property) {
         return mergeFrom((com.google.api.Property)other);
@@ -687,10 +707,12 @@ public Builder mergeFrom(com.google.api.Property other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -829,6 +851,7 @@ public Builder setTypeValue(int value) {
      * <code>.google.api.Property.PropertyType type = 2;</code>
      */
     public com.google.api.Property.PropertyType getType() {
+      @SuppressWarnings("deprecation")
       com.google.api.Property.PropertyType result = com.google.api.Property.PropertyType.valueOf(type_);
       return result == null ? com.google.api.Property.PropertyType.UNRECOGNIZED : result;
     }
@@ -950,11 +973,13 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -976,6 +1001,7 @@ public static com.google.api.Property getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Property>
       PARSER = new com.google.protobuf.AbstractParser<Property>() {
+    @java.lang.Override
     public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -993,6 +1019,7 @@ public com.google.protobuf.Parser<Property> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Property getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Quota.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Quota.java
index 1623a484b..47b7f19a0 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Quota.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Quota.java
@@ -87,13 +87,6 @@ private Quota(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 26: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               limits_ = new java.util.ArrayList<com.google.api.QuotaLimit>();
@@ -112,6 +105,13 @@ private Quota(
                 input.readMessage(com.google.api.MetricRule.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -135,6 +135,7 @@ private Quota(
     return com.google.api.QuotaProto.internal_static_google_api_Quota_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.QuotaProto.internal_static_google_api_Quota_fieldAccessorTable
@@ -268,6 +269,7 @@ public com.google.api.MetricRuleOrBuilder getMetricRulesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -277,6 +279,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < limits_.size(); i++) {
@@ -288,6 +291,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -415,6 +419,7 @@ public static com.google.api.Quota parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -422,6 +427,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Quota prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -488,6 +494,7 @@ public static final class Builder extends
       return com.google.api.QuotaProto.internal_static_google_api_Quota_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.QuotaProto.internal_static_google_api_Quota_fieldAccessorTable
@@ -512,6 +519,7 @@ private void maybeForceBuilderInitialization() {
         getMetricRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (limitsBuilder_ == null) {
@@ -529,15 +537,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.QuotaProto.internal_static_google_api_Quota_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Quota getDefaultInstanceForType() {
       return com.google.api.Quota.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Quota build() {
       com.google.api.Quota result = buildPartial();
       if (!result.isInitialized()) {
@@ -546,6 +557,7 @@ public com.google.api.Quota build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Quota buildPartial() {
       com.google.api.Quota result = new com.google.api.Quota(this);
       int from_bitField0_ = bitField0_;
@@ -571,32 +583,39 @@ public com.google.api.Quota buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Quota) {
         return mergeFrom((com.google.api.Quota)other);
@@ -665,10 +684,12 @@ public Builder mergeFrom(com.google.api.Quota other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1365,11 +1386,13 @@ public com.google.api.MetricRule.Builder addMetricRulesBuilder(
       }
       return metricRulesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1391,6 +1414,7 @@ public static com.google.api.Quota getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Quota>
       PARSER = new com.google.protobuf.AbstractParser<Quota>() {
+    @java.lang.Override
     public Quota parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1408,6 +1432,7 @@ public com.google.protobuf.Parser<Quota> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Quota getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
index a4c1a260b..70dffa079 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
@@ -57,13 +57,6 @@ private QuotaLimit(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -128,6 +121,13 @@ private QuotaLimit(
             displayName_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -146,6 +146,7 @@ private QuotaLimit(
   }
 
   @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -156,6 +157,7 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.QuotaProto.internal_static_google_api_QuotaLimit_fieldAccessorTable
@@ -765,6 +767,7 @@ public java.lang.String getDisplayName() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -774,6 +777,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDescriptionBytes().isEmpty()) {
@@ -812,6 +816,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1004,6 +1009,7 @@ public static com.google.api.QuotaLimit parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1011,6 +1017,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.QuotaLimit prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1062,6 +1069,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.QuotaProto.internal_static_google_api_QuotaLimit_fieldAccessorTable
@@ -1084,6 +1092,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1108,15 +1117,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.QuotaProto.internal_static_google_api_QuotaLimit_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.QuotaLimit getDefaultInstanceForType() {
       return com.google.api.QuotaLimit.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.QuotaLimit build() {
       com.google.api.QuotaLimit result = buildPartial();
       if (!result.isInitialized()) {
@@ -1125,6 +1137,7 @@ public com.google.api.QuotaLimit build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.QuotaLimit buildPartial() {
       com.google.api.QuotaLimit result = new com.google.api.QuotaLimit(this);
       int from_bitField0_ = bitField0_;
@@ -1145,32 +1158,39 @@ public com.google.api.QuotaLimit buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.QuotaLimit) {
         return mergeFrom((com.google.api.QuotaLimit)other);
@@ -1222,10 +1242,12 @@ public Builder mergeFrom(com.google.api.QuotaLimit other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2523,11 +2545,13 @@ public Builder setDisplayNameBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2549,6 +2573,7 @@ public static com.google.api.QuotaLimit getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<QuotaLimit>
       PARSER = new com.google.protobuf.AbstractParser<QuotaLimit>() {
+    @java.lang.Override
     public QuotaLimit parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2566,6 +2591,7 @@ public com.google.protobuf.Parser<QuotaLimit> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.QuotaLimit getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Resource.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Resource.java
new file mode 100644
index 000000000..ffc575123
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Resource.java
@@ -0,0 +1,755 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/resources.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * An annotation designating that this field designates a One Platform
+ * resource.
+ * </pre>
+ *
+ * Protobuf type {@code google.api.Resource}
+ */
+public  final class Resource extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.Resource)
+    ResourceOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Resource.newBuilder() to construct.
+  private Resource(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private Resource() {
+    path_ = "";
+    baseName_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Resource(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            path_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            baseName_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.ResourcesProto.internal_static_google_api_Resource_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.ResourcesProto.internal_static_google_api_Resource_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.Resource.class, com.google.api.Resource.Builder.class);
+  }
+
+  public static final int PATH_FIELD_NUMBER = 1;
+  private volatile java.lang.Object path_;
+  /**
+   * <pre>
+   * Required. The resource's path. This is usually in a form such as:
+   *   projects/&#42;&#47;things/&#42;
+   * </pre>
+   *
+   * <code>string path = 1;</code>
+   */
+  public java.lang.String getPath() {
+    java.lang.Object ref = path_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      path_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * Required. The resource's path. This is usually in a form such as:
+   *   projects/&#42;&#47;things/&#42;
+   * </pre>
+   *
+   * <code>string path = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getPathBytes() {
+    java.lang.Object ref = path_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      path_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int BASE_NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object baseName_;
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * This is required if the resource is within a ResourceSet (see below).
+   * </pre>
+   *
+   * <code>string base_name = 2;</code>
+   */
+  public java.lang.String getBaseName() {
+    java.lang.Object ref = baseName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      baseName_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * This is required if the resource is within a ResourceSet (see below).
+   * </pre>
+   *
+   * <code>string base_name = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getBaseNameBytes() {
+    java.lang.Object ref = baseName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      baseName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getPathBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, path_);
+    }
+    if (!getBaseNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, baseName_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getPathBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, path_);
+    }
+    if (!getBaseNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, baseName_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.Resource)) {
+      return super.equals(obj);
+    }
+    com.google.api.Resource other = (com.google.api.Resource) obj;
+
+    boolean result = true;
+    result = result && getPath()
+        .equals(other.getPath());
+    result = result && getBaseName()
+        .equals(other.getBaseName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PATH_FIELD_NUMBER;
+    hash = (53 * hash) + getPath().hashCode();
+    hash = (37 * hash) + BASE_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getBaseName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.Resource parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Resource parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Resource parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Resource parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Resource parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Resource parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Resource parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Resource parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Resource parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.Resource parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Resource parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Resource parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.Resource prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * An annotation designating that this field designates a One Platform
+   * resource.
+   * </pre>
+   *
+   * Protobuf type {@code google.api.Resource}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.Resource)
+      com.google.api.ResourceOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.ResourcesProto.internal_static_google_api_Resource_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.ResourcesProto.internal_static_google_api_Resource_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.Resource.class, com.google.api.Resource.Builder.class);
+    }
+
+    // Construct using com.google.api.Resource.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      path_ = "";
+
+      baseName_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.ResourcesProto.internal_static_google_api_Resource_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.Resource getDefaultInstanceForType() {
+      return com.google.api.Resource.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.Resource build() {
+      com.google.api.Resource result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.Resource buildPartial() {
+      com.google.api.Resource result = new com.google.api.Resource(this);
+      result.path_ = path_;
+      result.baseName_ = baseName_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.Resource) {
+        return mergeFrom((com.google.api.Resource)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.Resource other) {
+      if (other == com.google.api.Resource.getDefaultInstance()) return this;
+      if (!other.getPath().isEmpty()) {
+        path_ = other.path_;
+        onChanged();
+      }
+      if (!other.getBaseName().isEmpty()) {
+        baseName_ = other.baseName_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.Resource parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Resource) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object path_ = "";
+    /**
+     * <pre>
+     * Required. The resource's path. This is usually in a form such as:
+     *   projects/&#42;&#47;things/&#42;
+     * </pre>
+     *
+     * <code>string path = 1;</code>
+     */
+    public java.lang.String getPath() {
+      java.lang.Object ref = path_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        path_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Required. The resource's path. This is usually in a form such as:
+     *   projects/&#42;&#47;things/&#42;
+     * </pre>
+     *
+     * <code>string path = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPathBytes() {
+      java.lang.Object ref = path_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        path_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Required. The resource's path. This is usually in a form such as:
+     *   projects/&#42;&#47;things/&#42;
+     * </pre>
+     *
+     * <code>string path = 1;</code>
+     */
+    public Builder setPath(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      path_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Required. The resource's path. This is usually in a form such as:
+     *   projects/&#42;&#47;things/&#42;
+     * </pre>
+     *
+     * <code>string path = 1;</code>
+     */
+    public Builder clearPath() {
+      
+      path_ = getDefaultInstance().getPath();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Required. The resource's path. This is usually in a form such as:
+     *   projects/&#42;&#47;things/&#42;
+     * </pre>
+     *
+     * <code>string path = 1;</code>
+     */
+    public Builder setPathBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      path_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object baseName_ = "";
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * This is required if the resource is within a ResourceSet (see below).
+     * </pre>
+     *
+     * <code>string base_name = 2;</code>
+     */
+    public java.lang.String getBaseName() {
+      java.lang.Object ref = baseName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        baseName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * This is required if the resource is within a ResourceSet (see below).
+     * </pre>
+     *
+     * <code>string base_name = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getBaseNameBytes() {
+      java.lang.Object ref = baseName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        baseName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * This is required if the resource is within a ResourceSet (see below).
+     * </pre>
+     *
+     * <code>string base_name = 2;</code>
+     */
+    public Builder setBaseName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      baseName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * This is required if the resource is within a ResourceSet (see below).
+     * </pre>
+     *
+     * <code>string base_name = 2;</code>
+     */
+    public Builder clearBaseName() {
+      
+      baseName_ = getDefaultInstance().getBaseName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * This is required if the resource is within a ResourceSet (see below).
+     * </pre>
+     *
+     * <code>string base_name = 2;</code>
+     */
+    public Builder setBaseNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      baseName_ = value;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.Resource)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.Resource)
+  private static final com.google.api.Resource DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.Resource();
+  }
+
+  public static com.google.api.Resource getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<Resource>
+      PARSER = new com.google.protobuf.AbstractParser<Resource>() {
+    @java.lang.Override
+    public Resource parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Resource(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<Resource> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<Resource> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.Resource getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceOrBuilder.java
new file mode 100644
index 000000000..a2819f638
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceOrBuilder.java
@@ -0,0 +1,51 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/resources.proto
+
+package com.google.api;
+
+public interface ResourceOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.Resource)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * Required. The resource's path. This is usually in a form such as:
+   *   projects/&#42;&#47;things/&#42;
+   * </pre>
+   *
+   * <code>string path = 1;</code>
+   */
+  java.lang.String getPath();
+  /**
+   * <pre>
+   * Required. The resource's path. This is usually in a form such as:
+   *   projects/&#42;&#47;things/&#42;
+   * </pre>
+   *
+   * <code>string path = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getPathBytes();
+
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * This is required if the resource is within a ResourceSet (see below).
+   * </pre>
+   *
+   * <code>string base_name = 2;</code>
+   */
+  java.lang.String getBaseName();
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * This is required if the resource is within a ResourceSet (see below).
+   * </pre>
+   *
+   * <code>string base_name = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getBaseNameBytes();
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceSet.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceSet.java
new file mode 100644
index 000000000..807e9e64e
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceSet.java
@@ -0,0 +1,1026 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/resources.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * An annotation designating that this field designates a set of One Platform
+ * resources.
+ * </pre>
+ *
+ * Protobuf type {@code google.api.ResourceSet}
+ */
+public  final class ResourceSet extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.ResourceSet)
+    ResourceSetOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ResourceSet.newBuilder() to construct.
+  private ResourceSet(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private ResourceSet() {
+    baseName_ = "";
+    resources_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ResourceSet(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            baseName_ = s;
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              resources_ = new java.util.ArrayList<com.google.api.Resource>();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            resources_.add(
+                input.readMessage(com.google.api.Resource.parser(), extensionRegistry));
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+        resources_ = java.util.Collections.unmodifiableList(resources_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.ResourcesProto.internal_static_google_api_ResourceSet_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.ResourcesProto.internal_static_google_api_ResourceSet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.ResourceSet.class, com.google.api.ResourceSet.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int BASE_NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object baseName_;
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * </pre>
+   *
+   * <code>string base_name = 1;</code>
+   */
+  public java.lang.String getBaseName() {
+    java.lang.Object ref = baseName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      baseName_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * </pre>
+   *
+   * <code>string base_name = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getBaseNameBytes() {
+    java.lang.Object ref = baseName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      baseName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int RESOURCES_FIELD_NUMBER = 2;
+  private java.util.List<com.google.api.Resource> resources_;
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  public java.util.List<com.google.api.Resource> getResourcesList() {
+    return resources_;
+  }
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  public java.util.List<? extends com.google.api.ResourceOrBuilder> 
+      getResourcesOrBuilderList() {
+    return resources_;
+  }
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  public int getResourcesCount() {
+    return resources_.size();
+  }
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  public com.google.api.Resource getResources(int index) {
+    return resources_.get(index);
+  }
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  public com.google.api.ResourceOrBuilder getResourcesOrBuilder(
+      int index) {
+    return resources_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getBaseNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, baseName_);
+    }
+    for (int i = 0; i < resources_.size(); i++) {
+      output.writeMessage(2, resources_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getBaseNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, baseName_);
+    }
+    for (int i = 0; i < resources_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, resources_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.ResourceSet)) {
+      return super.equals(obj);
+    }
+    com.google.api.ResourceSet other = (com.google.api.ResourceSet) obj;
+
+    boolean result = true;
+    result = result && getBaseName()
+        .equals(other.getBaseName());
+    result = result && getResourcesList()
+        .equals(other.getResourcesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + BASE_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getBaseName().hashCode();
+    if (getResourcesCount() > 0) {
+      hash = (37 * hash) + RESOURCES_FIELD_NUMBER;
+      hash = (53 * hash) + getResourcesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.ResourceSet parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.ResourceSet parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.ResourceSet parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.ResourceSet parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.ResourceSet parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.ResourceSet parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.ResourceSet prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * An annotation designating that this field designates a set of One Platform
+   * resources.
+   * </pre>
+   *
+   * Protobuf type {@code google.api.ResourceSet}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.ResourceSet)
+      com.google.api.ResourceSetOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.ResourcesProto.internal_static_google_api_ResourceSet_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.ResourcesProto.internal_static_google_api_ResourceSet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.ResourceSet.class, com.google.api.ResourceSet.Builder.class);
+    }
+
+    // Construct using com.google.api.ResourceSet.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getResourcesFieldBuilder();
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      baseName_ = "";
+
+      if (resourcesBuilder_ == null) {
+        resources_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      } else {
+        resourcesBuilder_.clear();
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.ResourcesProto.internal_static_google_api_ResourceSet_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.ResourceSet getDefaultInstanceForType() {
+      return com.google.api.ResourceSet.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.ResourceSet build() {
+      com.google.api.ResourceSet result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.ResourceSet buildPartial() {
+      com.google.api.ResourceSet result = new com.google.api.ResourceSet(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.baseName_ = baseName_;
+      if (resourcesBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          resources_ = java.util.Collections.unmodifiableList(resources_);
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.resources_ = resources_;
+      } else {
+        result.resources_ = resourcesBuilder_.build();
+      }
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.ResourceSet) {
+        return mergeFrom((com.google.api.ResourceSet)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.ResourceSet other) {
+      if (other == com.google.api.ResourceSet.getDefaultInstance()) return this;
+      if (!other.getBaseName().isEmpty()) {
+        baseName_ = other.baseName_;
+        onChanged();
+      }
+      if (resourcesBuilder_ == null) {
+        if (!other.resources_.isEmpty()) {
+          if (resources_.isEmpty()) {
+            resources_ = other.resources_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureResourcesIsMutable();
+            resources_.addAll(other.resources_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.resources_.isEmpty()) {
+          if (resourcesBuilder_.isEmpty()) {
+            resourcesBuilder_.dispose();
+            resourcesBuilder_ = null;
+            resources_ = other.resources_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            resourcesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getResourcesFieldBuilder() : null;
+          } else {
+            resourcesBuilder_.addAllMessages(other.resources_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.ResourceSet parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ResourceSet) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object baseName_ = "";
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * </pre>
+     *
+     * <code>string base_name = 1;</code>
+     */
+    public java.lang.String getBaseName() {
+      java.lang.Object ref = baseName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        baseName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * </pre>
+     *
+     * <code>string base_name = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getBaseNameBytes() {
+      java.lang.Object ref = baseName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        baseName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * </pre>
+     *
+     * <code>string base_name = 1;</code>
+     */
+    public Builder setBaseName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      baseName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * </pre>
+     *
+     * <code>string base_name = 1;</code>
+     */
+    public Builder clearBaseName() {
+      
+      baseName_ = getDefaultInstance().getBaseName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The colloquial name of the resource.
+     * If omitted, this is the name of the message.
+     * </pre>
+     *
+     * <code>string base_name = 1;</code>
+     */
+    public Builder setBaseNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      baseName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List<com.google.api.Resource> resources_ =
+      java.util.Collections.emptyList();
+    private void ensureResourcesIsMutable() {
+      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+        resources_ = new java.util.ArrayList<com.google.api.Resource>(resources_);
+        bitField0_ |= 0x00000002;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.api.Resource, com.google.api.Resource.Builder, com.google.api.ResourceOrBuilder> resourcesBuilder_;
+
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public java.util.List<com.google.api.Resource> getResourcesList() {
+      if (resourcesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(resources_);
+      } else {
+        return resourcesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public int getResourcesCount() {
+      if (resourcesBuilder_ == null) {
+        return resources_.size();
+      } else {
+        return resourcesBuilder_.getCount();
+      }
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public com.google.api.Resource getResources(int index) {
+      if (resourcesBuilder_ == null) {
+        return resources_.get(index);
+      } else {
+        return resourcesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder setResources(
+        int index, com.google.api.Resource value) {
+      if (resourcesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResourcesIsMutable();
+        resources_.set(index, value);
+        onChanged();
+      } else {
+        resourcesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder setResources(
+        int index, com.google.api.Resource.Builder builderForValue) {
+      if (resourcesBuilder_ == null) {
+        ensureResourcesIsMutable();
+        resources_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        resourcesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder addResources(com.google.api.Resource value) {
+      if (resourcesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResourcesIsMutable();
+        resources_.add(value);
+        onChanged();
+      } else {
+        resourcesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder addResources(
+        int index, com.google.api.Resource value) {
+      if (resourcesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResourcesIsMutable();
+        resources_.add(index, value);
+        onChanged();
+      } else {
+        resourcesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder addResources(
+        com.google.api.Resource.Builder builderForValue) {
+      if (resourcesBuilder_ == null) {
+        ensureResourcesIsMutable();
+        resources_.add(builderForValue.build());
+        onChanged();
+      } else {
+        resourcesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder addResources(
+        int index, com.google.api.Resource.Builder builderForValue) {
+      if (resourcesBuilder_ == null) {
+        ensureResourcesIsMutable();
+        resources_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        resourcesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder addAllResources(
+        java.lang.Iterable<? extends com.google.api.Resource> values) {
+      if (resourcesBuilder_ == null) {
+        ensureResourcesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, resources_);
+        onChanged();
+      } else {
+        resourcesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder clearResources() {
+      if (resourcesBuilder_ == null) {
+        resources_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+      } else {
+        resourcesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public Builder removeResources(int index) {
+      if (resourcesBuilder_ == null) {
+        ensureResourcesIsMutable();
+        resources_.remove(index);
+        onChanged();
+      } else {
+        resourcesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public com.google.api.Resource.Builder getResourcesBuilder(
+        int index) {
+      return getResourcesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public com.google.api.ResourceOrBuilder getResourcesOrBuilder(
+        int index) {
+      if (resourcesBuilder_ == null) {
+        return resources_.get(index);  } else {
+        return resourcesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public java.util.List<? extends com.google.api.ResourceOrBuilder> 
+         getResourcesOrBuilderList() {
+      if (resourcesBuilder_ != null) {
+        return resourcesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(resources_);
+      }
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public com.google.api.Resource.Builder addResourcesBuilder() {
+      return getResourcesFieldBuilder().addBuilder(
+          com.google.api.Resource.getDefaultInstance());
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public com.google.api.Resource.Builder addResourcesBuilder(
+        int index) {
+      return getResourcesFieldBuilder().addBuilder(
+          index, com.google.api.Resource.getDefaultInstance());
+    }
+    /**
+     * <pre>
+     * The distinct resources that make up the set.
+     * </pre>
+     *
+     * <code>repeated .google.api.Resource resources = 2;</code>
+     */
+    public java.util.List<com.google.api.Resource.Builder> 
+         getResourcesBuilderList() {
+      return getResourcesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.api.Resource, com.google.api.Resource.Builder, com.google.api.ResourceOrBuilder> 
+        getResourcesFieldBuilder() {
+      if (resourcesBuilder_ == null) {
+        resourcesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.api.Resource, com.google.api.Resource.Builder, com.google.api.ResourceOrBuilder>(
+                resources_,
+                ((bitField0_ & 0x00000002) == 0x00000002),
+                getParentForChildren(),
+                isClean());
+        resources_ = null;
+      }
+      return resourcesBuilder_;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.ResourceSet)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.ResourceSet)
+  private static final com.google.api.ResourceSet DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.ResourceSet();
+  }
+
+  public static com.google.api.ResourceSet getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<ResourceSet>
+      PARSER = new com.google.protobuf.AbstractParser<ResourceSet>() {
+    @java.lang.Override
+    public ResourceSet parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ResourceSet(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<ResourceSet> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<ResourceSet> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.ResourceSet getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceSetOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceSetOrBuilder.java
new file mode 100644
index 000000000..70d22057e
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourceSetOrBuilder.java
@@ -0,0 +1,73 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/resources.proto
+
+package com.google.api;
+
+public interface ResourceSetOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.ResourceSet)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * </pre>
+   *
+   * <code>string base_name = 1;</code>
+   */
+  java.lang.String getBaseName();
+  /**
+   * <pre>
+   * The colloquial name of the resource.
+   * If omitted, this is the name of the message.
+   * </pre>
+   *
+   * <code>string base_name = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getBaseNameBytes();
+
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  java.util.List<com.google.api.Resource> 
+      getResourcesList();
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  com.google.api.Resource getResources(int index);
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  int getResourcesCount();
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  java.util.List<? extends com.google.api.ResourceOrBuilder> 
+      getResourcesOrBuilderList();
+  /**
+   * <pre>
+   * The distinct resources that make up the set.
+   * </pre>
+   *
+   * <code>repeated .google.api.Resource resources = 2;</code>
+   */
+  com.google.api.ResourceOrBuilder getResourcesOrBuilder(
+      int index);
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourcesProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourcesProto.java
new file mode 100644
index 000000000..657c74e0d
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ResourcesProto.java
@@ -0,0 +1,74 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/resources.proto
+
+package com.google.api;
+
+public final class ResourcesProto {
+  private ResourcesProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_api_Resource_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_api_Resource_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_api_ResourceSet_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_api_ResourceSet_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\032google/api/resources.proto\022\ngoogle.api" +
+      "\032 google/protobuf/descriptor.proto\"+\n\010Re" +
+      "source\022\014\n\004path\030\001 \001(\t\022\021\n\tbase_name\030\002 \001(\t\"" +
+      "I\n\013ResourceSet\022\021\n\tbase_name\030\001 \001(\t\022\'\n\tres" +
+      "ources\030\002 \003(\0132\024.google.api.ResourceBe\n\016co" +
+      "m.google.apiB\016ResourcesProtoP\001ZAgoogle.g" +
+      "olang.org/genproto/googleapis/api/annota" +
+      "tions;annotationsb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.protobuf.DescriptorProtos.getDescriptor(),
+        }, assigner);
+    internal_static_google_api_Resource_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_api_Resource_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_api_Resource_descriptor,
+        new java.lang.String[] { "Path", "BaseName", });
+    internal_static_google_api_ResourceSet_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_api_ResourceSet_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_api_ResourceSet_descriptor,
+        new java.lang.String[] { "BaseName", "Resources", });
+    com.google.protobuf.DescriptorProtos.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Retry.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Retry.java
new file mode 100644
index 000000000..2c4ba385e
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Retry.java
@@ -0,0 +1,778 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/retry.proto
+
+package com.google.api;
+
+/**
+ * <pre>
+ * Information about situations where retrying a request should be
+ * handled automatically.
+ * </pre>
+ *
+ * Protobuf type {@code google.api.Retry}
+ */
+public  final class Retry extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.api.Retry)
+    RetryOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Retry.newBuilder() to construct.
+  private Retry(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private Retry() {
+    codes_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Retry(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8: {
+            int rawValue = input.readEnum();
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              codes_ = new java.util.ArrayList<java.lang.Integer>();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            codes_.add(rawValue);
+            break;
+          }
+          case 10: {
+            int length = input.readRawVarint32();
+            int oldLimit = input.pushLimit(length);
+            while(input.getBytesUntilLimit() > 0) {
+              int rawValue = input.readEnum();
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                codes_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              codes_.add(rawValue);
+            }
+            input.popLimit(oldLimit);
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        codes_ = java.util.Collections.unmodifiableList(codes_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.api.RetryProto.internal_static_google_api_Retry_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.api.RetryProto.internal_static_google_api_Retry_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.api.Retry.class, com.google.api.Retry.Builder.class);
+  }
+
+  public static final int CODES_FIELD_NUMBER = 1;
+  private java.util.List<java.lang.Integer> codes_;
+  private static final com.google.protobuf.Internal.ListAdapter.Converter<
+      java.lang.Integer, com.google.rpc.Code> codes_converter_ =
+          new com.google.protobuf.Internal.ListAdapter.Converter<
+              java.lang.Integer, com.google.rpc.Code>() {
+            public com.google.rpc.Code convert(java.lang.Integer from) {
+              @SuppressWarnings("deprecation")
+              com.google.rpc.Code result = com.google.rpc.Code.valueOf(from);
+              return result == null ? com.google.rpc.Code.UNRECOGNIZED : result;
+            }
+          };
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  public java.util.List<com.google.rpc.Code> getCodesList() {
+    return new com.google.protobuf.Internal.ListAdapter<
+        java.lang.Integer, com.google.rpc.Code>(codes_, codes_converter_);
+  }
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  public int getCodesCount() {
+    return codes_.size();
+  }
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  public com.google.rpc.Code getCodes(int index) {
+    return codes_converter_.convert(codes_.get(index));
+  }
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  public java.util.List<java.lang.Integer>
+  getCodesValueList() {
+    return codes_;
+  }
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  public int getCodesValue(int index) {
+    return codes_.get(index);
+  }
+  private int codesMemoizedSerializedSize;
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    getSerializedSize();
+    if (getCodesList().size() > 0) {
+      output.writeUInt32NoTag(10);
+      output.writeUInt32NoTag(codesMemoizedSerializedSize);
+    }
+    for (int i = 0; i < codes_.size(); i++) {
+      output.writeEnumNoTag(codes_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < codes_.size(); i++) {
+        dataSize += com.google.protobuf.CodedOutputStream
+          .computeEnumSizeNoTag(codes_.get(i));
+      }
+      size += dataSize;
+      if (!getCodesList().isEmpty()) {  size += 1;
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32SizeNoTag(dataSize);
+      }codesMemoizedSerializedSize = dataSize;
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.api.Retry)) {
+      return super.equals(obj);
+    }
+    com.google.api.Retry other = (com.google.api.Retry) obj;
+
+    boolean result = true;
+    result = result && codes_.equals(other.codes_);
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getCodesCount() > 0) {
+      hash = (37 * hash) + CODES_FIELD_NUMBER;
+      hash = (53 * hash) + codes_.hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.api.Retry parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Retry parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Retry parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Retry parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Retry parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.api.Retry parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.api.Retry parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Retry parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Retry parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.api.Retry parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.api.Retry parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.api.Retry parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.api.Retry prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * Information about situations where retrying a request should be
+   * handled automatically.
+   * </pre>
+   *
+   * Protobuf type {@code google.api.Retry}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.api.Retry)
+      com.google.api.RetryOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.api.RetryProto.internal_static_google_api_Retry_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.api.RetryProto.internal_static_google_api_Retry_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.api.Retry.class, com.google.api.Retry.Builder.class);
+    }
+
+    // Construct using com.google.api.Retry.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      codes_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.api.RetryProto.internal_static_google_api_Retry_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.api.Retry getDefaultInstanceForType() {
+      return com.google.api.Retry.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.api.Retry build() {
+      com.google.api.Retry result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.api.Retry buildPartial() {
+      com.google.api.Retry result = new com.google.api.Retry(this);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        codes_ = java.util.Collections.unmodifiableList(codes_);
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.codes_ = codes_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.api.Retry) {
+        return mergeFrom((com.google.api.Retry)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.api.Retry other) {
+      if (other == com.google.api.Retry.getDefaultInstance()) return this;
+      if (!other.codes_.isEmpty()) {
+        if (codes_.isEmpty()) {
+          codes_ = other.codes_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureCodesIsMutable();
+          codes_.addAll(other.codes_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.api.Retry parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Retry) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List<java.lang.Integer> codes_ =
+      java.util.Collections.emptyList();
+    private void ensureCodesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        codes_ = new java.util.ArrayList<java.lang.Integer>(codes_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public java.util.List<com.google.rpc.Code> getCodesList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, com.google.rpc.Code>(codes_, codes_converter_);
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public int getCodesCount() {
+      return codes_.size();
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public com.google.rpc.Code getCodes(int index) {
+      return codes_converter_.convert(codes_.get(index));
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder setCodes(
+        int index, com.google.rpc.Code value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureCodesIsMutable();
+      codes_.set(index, value.getNumber());
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder addCodes(com.google.rpc.Code value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureCodesIsMutable();
+      codes_.add(value.getNumber());
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder addAllCodes(
+        java.lang.Iterable<? extends com.google.rpc.Code> values) {
+      ensureCodesIsMutable();
+      for (com.google.rpc.Code value : values) {
+        codes_.add(value.getNumber());
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder clearCodes() {
+      codes_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public java.util.List<java.lang.Integer>
+    getCodesValueList() {
+      return java.util.Collections.unmodifiableList(codes_);
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public int getCodesValue(int index) {
+      return codes_.get(index);
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder setCodesValue(
+        int index, int value) {
+      ensureCodesIsMutable();
+      codes_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder addCodesValue(int value) {
+      ensureCodesIsMutable();
+      codes_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Designate that the given gRPC error codes should be automatically
+     * retried by clients.
+     * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+     * to be idempotent (annotated with google.api.http with a `get` key).
+     * </pre>
+     *
+     * <code>repeated .google.rpc.Code codes = 1;</code>
+     */
+    public Builder addAllCodesValue(
+        java.lang.Iterable<java.lang.Integer> values) {
+      ensureCodesIsMutable();
+      for (int value : values) {
+        codes_.add(value);
+      }
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.api.Retry)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.api.Retry)
+  private static final com.google.api.Retry DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.api.Retry();
+  }
+
+  public static com.google.api.Retry getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<Retry>
+      PARSER = new com.google.protobuf.AbstractParser<Retry>() {
+    @java.lang.Override
+    public Retry parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Retry(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<Retry> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<Retry> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.api.Retry getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/RetryOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/RetryOrBuilder.java
new file mode 100644
index 000000000..f5b28fbef
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/RetryOrBuilder.java
@@ -0,0 +1,66 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/api/retry.proto
+
+package com.google.api;
+
+public interface RetryOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.api.Retry)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  java.util.List<com.google.rpc.Code> getCodesList();
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  int getCodesCount();
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  com.google.rpc.Code getCodes(int index);
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  java.util.List<java.lang.Integer>
+  getCodesValueList();
+  /**
+   * <pre>
+   * Designate that the given gRPC error codes should be automatically
+   * retried by clients.
+   * `INTERNAL` and `UNAVAILABLE` are retried on requests known
+   * to be idempotent (annotated with google.api.http with a `get` key).
+   * </pre>
+   *
+   * <code>repeated .google.rpc.Code codes = 1;</code>
+   */
+  int getCodesValue(int index);
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthorizationConfigProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/RetryProto.java
similarity index 60%
rename from generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthorizationConfigProto.java
rename to generated/java/proto-google-common-protos/src/main/java/com/google/api/RetryProto.java
index 98e266d52..dfd8bab3e 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/AuthorizationConfigProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/RetryProto.java
@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/api/experimental/authorization_config.proto
+// source: google/api/retry.proto
 
 package com.google.api;
 
-public final class AuthorizationConfigProto {
-  private AuthorizationConfigProto() {}
+public final class RetryProto {
+  private RetryProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -15,10 +15,10 @@ public static void registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_api_AuthorizationConfig_descriptor;
+    internal_static_google_api_Retry_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_api_AuthorizationConfig_fieldAccessorTable;
+      internal_static_google_api_Retry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -28,12 +28,13 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n2google/api/experimental/authorization_" +
-      "config.proto\022\ngoogle.api\"\'\n\023Authorizatio" +
-      "nConfig\022\020\n\010provider\030\001 \001(\tBb\n\016com.google." +
-      "apiB\030AuthorizationConfigProtoP\001Z-google." +
-      "golang.org/genproto/googleapis/api;api\242\002" +
-      "\004GAPIb\006proto3"
+      "\n\026google/api/retry.proto\022\ngoogle.api\032 go" +
+      "ogle/protobuf/descriptor.proto\032\025google/r" +
+      "pc/code.proto\"(\n\005Retry\022\037\n\005codes\030\001 \003(\0162\020." +
+      "google.rpc.CodeBa\n\016com.google.apiB\nRetry" +
+      "ProtoP\001ZAgoogle.golang.org/genproto/goog" +
+      "leapis/api/annotations;annotationsb\006prot" +
+      "o3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -46,13 +47,17 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.protobuf.DescriptorProtos.getDescriptor(),
+          com.google.rpc.CodeProto.getDescriptor(),
         }, assigner);
-    internal_static_google_api_AuthorizationConfig_descriptor =
+    internal_static_google_api_Retry_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_google_api_AuthorizationConfig_fieldAccessorTable = new
+    internal_static_google_api_Retry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_api_AuthorizationConfig_descriptor,
-        new java.lang.String[] { "Provider", });
+        internal_static_google_api_Retry_descriptor,
+        new java.lang.String[] { "Codes", });
+    com.google.protobuf.DescriptorProtos.getDescriptor();
+    com.google.rpc.CodeProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Service.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Service.java
index ee9cf953d..6813bf594 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Service.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Service.java
@@ -77,13 +77,6 @@ private Service(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -353,17 +346,11 @@ private Service(
 
             break;
           }
-          case 810: {
-            com.google.api.Experimental.Builder subBuilder = null;
-            if (experimental_ != null) {
-              subBuilder = experimental_.toBuilder();
-            }
-            experimental_ = input.readMessage(com.google.api.Experimental.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(experimental_);
-              experimental_ = subBuilder.buildPartial();
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
-
             break;
           }
         }
@@ -404,6 +391,7 @@ private Service(
     return com.google.api.ServiceProto.internal_static_google_api_Service_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.ServiceProto.internal_static_google_api_Service_fieldAccessorTable
@@ -1532,40 +1520,8 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
     return getSourceInfo();
   }
 
-  public static final int EXPERIMENTAL_FIELD_NUMBER = 101;
-  private com.google.api.Experimental experimental_;
-  /**
-   * <pre>
-   * Experimental configuration.
-   * </pre>
-   *
-   * <code>.google.api.Experimental experimental = 101;</code>
-   */
-  public boolean hasExperimental() {
-    return experimental_ != null;
-  }
-  /**
-   * <pre>
-   * Experimental configuration.
-   * </pre>
-   *
-   * <code>.google.api.Experimental experimental = 101;</code>
-   */
-  public com.google.api.Experimental getExperimental() {
-    return experimental_ == null ? com.google.api.Experimental.getDefaultInstance() : experimental_;
-  }
-  /**
-   * <pre>
-   * Experimental configuration.
-   * </pre>
-   *
-   * <code>.google.api.Experimental experimental = 101;</code>
-   */
-  public com.google.api.ExperimentalOrBuilder getExperimentalOrBuilder() {
-    return getExperimental();
-  }
-
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1575,6 +1531,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1652,12 +1609,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (sourceInfo_ != null) {
       output.writeMessage(37, getSourceInfo());
     }
-    if (experimental_ != null) {
-      output.writeMessage(101, getExperimental());
-    }
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1759,10 +1714,6 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(37, getSourceInfo());
     }
-    if (experimental_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(101, getExperimental());
-    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1871,11 +1822,6 @@ public boolean equals(final java.lang.Object obj) {
       result = result && getSourceInfo()
           .equals(other.getSourceInfo());
     }
-    result = result && (hasExperimental() == other.hasExperimental());
-    if (hasExperimental()) {
-      result = result && getExperimental()
-          .equals(other.getExperimental());
-    }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -1979,10 +1925,6 @@ public int hashCode() {
       hash = (37 * hash) + SOURCE_INFO_FIELD_NUMBER;
       hash = (53 * hash) + getSourceInfo().hashCode();
     }
-    if (hasExperimental()) {
-      hash = (37 * hash) + EXPERIMENTAL_FIELD_NUMBER;
-      hash = (53 * hash) + getExperimental().hashCode();
-    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -2058,6 +2000,7 @@ public static com.google.api.Service parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2065,6 +2008,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Service prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2112,6 +2056,7 @@ public static final class Builder extends
       return com.google.api.ServiceProto.internal_static_google_api_Service_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.ServiceProto.internal_static_google_api_Service_fieldAccessorTable
@@ -2141,6 +2086,7 @@ private void maybeForceBuilderInitialization() {
         getMonitoredResourcesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configVersionBuilder_ == null) {
@@ -2277,24 +2223,21 @@ public Builder clear() {
         sourceInfo_ = null;
         sourceInfoBuilder_ = null;
       }
-      if (experimentalBuilder_ == null) {
-        experimental_ = null;
-      } else {
-        experimental_ = null;
-        experimentalBuilder_ = null;
-      }
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.ServiceProto.internal_static_google_api_Service_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Service getDefaultInstanceForType() {
       return com.google.api.Service.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Service build() {
       com.google.api.Service result = buildPartial();
       if (!result.isInitialized()) {
@@ -2303,6 +2246,7 @@ public com.google.api.Service build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Service buildPartial() {
       com.google.api.Service result = new com.google.api.Service(this);
       int from_bitField0_ = bitField0_;
@@ -2444,42 +2388,44 @@ public com.google.api.Service buildPartial() {
       } else {
         result.sourceInfo_ = sourceInfoBuilder_.build();
       }
-      if (experimentalBuilder_ == null) {
-        result.experimental_ = experimental_;
-      } else {
-        result.experimental_ = experimentalBuilder_.build();
-      }
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Service) {
         return mergeFrom((com.google.api.Service)other);
@@ -2731,18 +2677,17 @@ public Builder mergeFrom(com.google.api.Service other) {
       if (other.hasSourceInfo()) {
         mergeSourceInfo(other.getSourceInfo());
       }
-      if (other.hasExperimental()) {
-        mergeExperimental(other.getExperimental());
-      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7809,164 +7754,13 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
       }
       return sourceInfoBuilder_;
     }
-
-    private com.google.api.Experimental experimental_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.api.Experimental, com.google.api.Experimental.Builder, com.google.api.ExperimentalOrBuilder> experimentalBuilder_;
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public boolean hasExperimental() {
-      return experimentalBuilder_ != null || experimental_ != null;
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public com.google.api.Experimental getExperimental() {
-      if (experimentalBuilder_ == null) {
-        return experimental_ == null ? com.google.api.Experimental.getDefaultInstance() : experimental_;
-      } else {
-        return experimentalBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public Builder setExperimental(com.google.api.Experimental value) {
-      if (experimentalBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        experimental_ = value;
-        onChanged();
-      } else {
-        experimentalBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public Builder setExperimental(
-        com.google.api.Experimental.Builder builderForValue) {
-      if (experimentalBuilder_ == null) {
-        experimental_ = builderForValue.build();
-        onChanged();
-      } else {
-        experimentalBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public Builder mergeExperimental(com.google.api.Experimental value) {
-      if (experimentalBuilder_ == null) {
-        if (experimental_ != null) {
-          experimental_ =
-            com.google.api.Experimental.newBuilder(experimental_).mergeFrom(value).buildPartial();
-        } else {
-          experimental_ = value;
-        }
-        onChanged();
-      } else {
-        experimentalBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public Builder clearExperimental() {
-      if (experimentalBuilder_ == null) {
-        experimental_ = null;
-        onChanged();
-      } else {
-        experimental_ = null;
-        experimentalBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public com.google.api.Experimental.Builder getExperimentalBuilder() {
-      
-      onChanged();
-      return getExperimentalFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    public com.google.api.ExperimentalOrBuilder getExperimentalOrBuilder() {
-      if (experimentalBuilder_ != null) {
-        return experimentalBuilder_.getMessageOrBuilder();
-      } else {
-        return experimental_ == null ?
-            com.google.api.Experimental.getDefaultInstance() : experimental_;
-      }
-    }
-    /**
-     * <pre>
-     * Experimental configuration.
-     * </pre>
-     *
-     * <code>.google.api.Experimental experimental = 101;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.api.Experimental, com.google.api.Experimental.Builder, com.google.api.ExperimentalOrBuilder> 
-        getExperimentalFieldBuilder() {
-      if (experimentalBuilder_ == null) {
-        experimentalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.api.Experimental, com.google.api.Experimental.Builder, com.google.api.ExperimentalOrBuilder>(
-                getExperimental(),
-                getParentForChildren(),
-                isClean());
-        experimental_ = null;
-      }
-      return experimentalBuilder_;
-    }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7988,6 +7782,7 @@ public static com.google.api.Service getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Service>
       PARSER = new com.google.protobuf.AbstractParser<Service>() {
+    @java.lang.Override
     public Service parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8005,6 +7800,7 @@ public com.google.protobuf.Parser<Service> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Service getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java
index 96ca41256..e985ab9f2 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java
@@ -841,29 +841,4 @@ com.google.api.MonitoredResourceDescriptorOrBuilder getMonitoredResourcesOrBuild
    * <code>.google.api.SourceInfo source_info = 37;</code>
    */
   com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder();
-
-  /**
-   * <pre>
-   * Experimental configuration.
-   * </pre>
-   *
-   * <code>.google.api.Experimental experimental = 101;</code>
-   */
-  boolean hasExperimental();
-  /**
-   * <pre>
-   * Experimental configuration.
-   * </pre>
-   *
-   * <code>.google.api.Experimental experimental = 101;</code>
-   */
-  com.google.api.Experimental getExperimental();
-  /**
-   * <pre>
-   * Experimental configuration.
-   * </pre>
-   *
-   * <code>.google.api.Experimental experimental = 101;</code>
-   */
-  com.google.api.ExperimentalOrBuilder getExperimentalOrBuilder();
 }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java
index 5e7ddbb41..70e7bd7d4 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java
@@ -34,47 +34,44 @@ public static void registerAllExtensions(
       "oogle/api/billing.proto\032\030google/api/cont" +
       "ext.proto\032\030google/api/control.proto\032\036goo" +
       "gle/api/documentation.proto\032\031google/api/" +
-      "endpoint.proto\032*google/api/experimental/" +
-      "experimental.proto\032\025google/api/http.prot" +
-      "o\032\026google/api/label.proto\032\024google/api/lo" +
-      "g.proto\032\030google/api/logging.proto\032\027googl" +
-      "e/api/metric.proto\032#google/api/monitored" +
-      "_resource.proto\032\033google/api/monitoring.p" +
-      "roto\032\026google/api/quota.proto\032\034google/api" +
-      "/source_info.proto\032!google/api/system_pa" +
-      "rameter.proto\032\026google/api/usage.proto\032\031g" +
-      "oogle/protobuf/any.proto\032\031google/protobu" +
-      "f/api.proto\032\032google/protobuf/type.proto\032" +
-      "\036google/protobuf/wrappers.proto\"\206\010\n\007Serv" +
-      "ice\0224\n\016config_version\030\024 \001(\0132\034.google.pro" +
-      "tobuf.UInt32Value\022\014\n\004name\030\001 \001(\t\022\n\n\002id\030! " +
-      "\001(\t\022\r\n\005title\030\002 \001(\t\022\033\n\023producer_project_i" +
-      "d\030\026 \001(\t\022\"\n\004apis\030\003 \003(\0132\024.google.protobuf." +
-      "Api\022$\n\005types\030\004 \003(\0132\025.google.protobuf.Typ" +
-      "e\022$\n\005enums\030\005 \003(\0132\025.google.protobuf.Enum\022" +
-      "0\n\rdocumentation\030\006 \001(\0132\031.google.api.Docu" +
-      "mentation\022$\n\007backend\030\010 \001(\0132\023.google.api." +
-      "Backend\022\036\n\004http\030\t \001(\0132\020.google.api.Http\022" +
-      " \n\005quota\030\n \001(\0132\021.google.api.Quota\0222\n\016aut" +
-      "hentication\030\013 \001(\0132\032.google.api.Authentic" +
-      "ation\022$\n\007context\030\014 \001(\0132\023.google.api.Cont" +
-      "ext\022 \n\005usage\030\017 \001(\0132\021.google.api.Usage\022\'\n" +
-      "\tendpoints\030\022 \003(\0132\024.google.api.Endpoint\022$" +
-      "\n\007control\030\025 \001(\0132\023.google.api.Control\022\'\n\004" +
-      "logs\030\027 \003(\0132\031.google.api.LogDescriptor\022-\n" +
-      "\007metrics\030\030 \003(\0132\034.google.api.MetricDescri" +
-      "ptor\022D\n\023monitored_resources\030\031 \003(\0132\'.goog" +
-      "le.api.MonitoredResourceDescriptor\022$\n\007bi" +
-      "lling\030\032 \001(\0132\023.google.api.Billing\022$\n\007logg" +
-      "ing\030\033 \001(\0132\023.google.api.Logging\022*\n\nmonito" +
-      "ring\030\034 \001(\0132\026.google.api.Monitoring\0227\n\021sy" +
-      "stem_parameters\030\035 \001(\0132\034.google.api.Syste" +
-      "mParameters\022+\n\013source_info\030% \001(\0132\026.googl" +
-      "e.api.SourceInfo\022.\n\014experimental\030e \001(\0132\030" +
-      ".google.api.ExperimentalBn\n\016com.google.a" +
-      "piB\014ServiceProtoP\001ZEgoogle.golang.org/ge" +
-      "nproto/googleapis/api/serviceconfig;serv" +
-      "iceconfig\242\002\004GAPIb\006proto3"
+      "endpoint.proto\032\025google/api/http.proto\032\024g" +
+      "oogle/api/log.proto\032\030google/api/logging." +
+      "proto\032\027google/api/metric.proto\032#google/a" +
+      "pi/monitored_resource.proto\032\033google/api/" +
+      "monitoring.proto\032\026google/api/quota.proto" +
+      "\032\034google/api/source_info.proto\032!google/a" +
+      "pi/system_parameter.proto\032\026google/api/us" +
+      "age.proto\032\031google/protobuf/api.proto\032\032go" +
+      "ogle/protobuf/type.proto\032\036google/protobu" +
+      "f/wrappers.proto\"\334\007\n\007Service\0224\n\016config_v" +
+      "ersion\030\024 \001(\0132\034.google.protobuf.UInt32Val" +
+      "ue\022\014\n\004name\030\001 \001(\t\022\n\n\002id\030! \001(\t\022\r\n\005title\030\002 " +
+      "\001(\t\022\033\n\023producer_project_id\030\026 \001(\t\022\"\n\004apis" +
+      "\030\003 \003(\0132\024.google.protobuf.Api\022$\n\005types\030\004 " +
+      "\003(\0132\025.google.protobuf.Type\022$\n\005enums\030\005 \003(" +
+      "\0132\025.google.protobuf.Enum\0220\n\rdocumentatio" +
+      "n\030\006 \001(\0132\031.google.api.Documentation\022$\n\007ba" +
+      "ckend\030\010 \001(\0132\023.google.api.Backend\022\036\n\004http" +
+      "\030\t \001(\0132\020.google.api.Http\022 \n\005quota\030\n \001(\0132" +
+      "\021.google.api.Quota\0222\n\016authentication\030\013 \001" +
+      "(\0132\032.google.api.Authentication\022$\n\007contex" +
+      "t\030\014 \001(\0132\023.google.api.Context\022 \n\005usage\030\017 " +
+      "\001(\0132\021.google.api.Usage\022\'\n\tendpoints\030\022 \003(" +
+      "\0132\024.google.api.Endpoint\022$\n\007control\030\025 \001(\013" +
+      "2\023.google.api.Control\022\'\n\004logs\030\027 \003(\0132\031.go" +
+      "ogle.api.LogDescriptor\022-\n\007metrics\030\030 \003(\0132" +
+      "\034.google.api.MetricDescriptor\022D\n\023monitor" +
+      "ed_resources\030\031 \003(\0132\'.google.api.Monitore" +
+      "dResourceDescriptor\022$\n\007billing\030\032 \001(\0132\023.g" +
+      "oogle.api.Billing\022$\n\007logging\030\033 \001(\0132\023.goo" +
+      "gle.api.Logging\022*\n\nmonitoring\030\034 \001(\0132\026.go" +
+      "ogle.api.Monitoring\0227\n\021system_parameters" +
+      "\030\035 \001(\0132\034.google.api.SystemParameters\022+\n\013" +
+      "source_info\030% \001(\0132\026.google.api.SourceInf" +
+      "oJ\004\010e\020fBn\n\016com.google.apiB\014ServiceProtoP" +
+      "\001ZEgoogle.golang.org/genproto/googleapis" +
+      "/api/serviceconfig;serviceconfig\242\002\004GAPIb" +
+      "\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -95,9 +92,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
           com.google.api.ControlProto.getDescriptor(),
           com.google.api.DocumentationProto.getDescriptor(),
           com.google.api.EndpointProto.getDescriptor(),
-          com.google.api.ExperimentalProto.getDescriptor(),
           com.google.api.HttpProto.getDescriptor(),
-          com.google.api.LabelProto.getDescriptor(),
           com.google.api.LogProto.getDescriptor(),
           com.google.api.LoggingProto.getDescriptor(),
           com.google.api.MetricProto.getDescriptor(),
@@ -107,7 +102,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
           com.google.api.SourceInfoProto.getDescriptor(),
           com.google.api.SystemParameterProto.getDescriptor(),
           com.google.api.UsageProto.getDescriptor(),
-          com.google.protobuf.AnyProto.getDescriptor(),
           com.google.protobuf.ApiProto.getDescriptor(),
           com.google.protobuf.TypeProto.getDescriptor(),
           com.google.protobuf.WrappersProto.getDescriptor(),
@@ -117,7 +111,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_api_Service_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_api_Service_descriptor,
-        new java.lang.String[] { "ConfigVersion", "Name", "Id", "Title", "ProducerProjectId", "Apis", "Types", "Enums", "Documentation", "Backend", "Http", "Quota", "Authentication", "Context", "Usage", "Endpoints", "Control", "Logs", "Metrics", "MonitoredResources", "Billing", "Logging", "Monitoring", "SystemParameters", "SourceInfo", "Experimental", });
+        new java.lang.String[] { "ConfigVersion", "Name", "Id", "Title", "ProducerProjectId", "Apis", "Types", "Enums", "Documentation", "Backend", "Http", "Quota", "Authentication", "Context", "Usage", "Endpoints", "Control", "Logs", "Metrics", "MonitoredResources", "Billing", "Logging", "Monitoring", "SystemParameters", "SourceInfo", });
     com.google.api.AnnotationsProto.getDescriptor();
     com.google.api.AuthProto.getDescriptor();
     com.google.api.BackendProto.getDescriptor();
@@ -126,9 +120,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     com.google.api.ControlProto.getDescriptor();
     com.google.api.DocumentationProto.getDescriptor();
     com.google.api.EndpointProto.getDescriptor();
-    com.google.api.ExperimentalProto.getDescriptor();
     com.google.api.HttpProto.getDescriptor();
-    com.google.api.LabelProto.getDescriptor();
     com.google.api.LogProto.getDescriptor();
     com.google.api.LoggingProto.getDescriptor();
     com.google.api.MetricProto.getDescriptor();
@@ -138,7 +130,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     com.google.api.SourceInfoProto.getDescriptor();
     com.google.api.SystemParameterProto.getDescriptor();
     com.google.api.UsageProto.getDescriptor();
-    com.google.protobuf.AnyProto.getDescriptor();
     com.google.protobuf.ApiProto.getDescriptor();
     com.google.protobuf.TypeProto.getDescriptor();
     com.google.protobuf.WrappersProto.getDescriptor();
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ExperimentalProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SignatureProto.java
similarity index 56%
rename from generated/java/proto-google-common-protos/src/main/java/com/google/api/ExperimentalProto.java
rename to generated/java/proto-google-common-protos/src/main/java/com/google/api/SignatureProto.java
index 36d90cf04..ca998def9 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/ExperimentalProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SignatureProto.java
@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/api/experimental/experimental.proto
+// source: google/api/signature.proto
 
 package com.google.api;
 
-public final class ExperimentalProto {
-  private ExperimentalProto() {}
+public final class SignatureProto {
+  private SignatureProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -15,10 +15,10 @@ public static void registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_api_Experimental_descriptor;
+    internal_static_google_api_MethodSignature_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_api_Experimental_fieldAccessorTable;
+      internal_static_google_api_MethodSignature_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -28,14 +28,14 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n*google/api/experimental/experimental.p" +
-      "roto\022\ngoogle.api\032\034google/api/annotations" +
-      ".proto\0322google/api/experimental/authoriz" +
-      "ation_config.proto\"F\n\014Experimental\0226\n\rau" +
-      "thorization\030\010 \001(\0132\037.google.api.Authoriza" +
-      "tionConfigB[\n\016com.google.apiB\021Experiment" +
-      "alProtoP\001Z-google.golang.org/genproto/go" +
-      "ogleapis/api;api\242\002\004GAPIb\006proto3"
+      "\n\032google/api/signature.proto\022\ngoogle.api" +
+      "\032 google/protobuf/descriptor.proto\"t\n\017Me" +
+      "thodSignature\022\016\n\006fields\030\001 \003(\t\022\025\n\rfunctio" +
+      "n_name\030\002 \001(\t\022:\n\025additional_signatures\030\003 " +
+      "\003(\0132\033.google.api.MethodSignatureBe\n\016com." +
+      "google.apiB\016SignatureProtoP\001ZAgoogle.gol" +
+      "ang.org/genproto/googleapis/api/annotati" +
+      "ons;annotationsb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -48,17 +48,15 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.api.AuthorizationConfigProto.getDescriptor(),
+          com.google.protobuf.DescriptorProtos.getDescriptor(),
         }, assigner);
-    internal_static_google_api_Experimental_descriptor =
+    internal_static_google_api_MethodSignature_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_google_api_Experimental_fieldAccessorTable = new
+    internal_static_google_api_MethodSignature_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_api_Experimental_descriptor,
-        new java.lang.String[] { "Authorization", });
-    com.google.api.AnnotationsProto.getDescriptor();
-    com.google.api.AuthorizationConfigProto.getDescriptor();
+        internal_static_google_api_MethodSignature_descriptor,
+        new java.lang.String[] { "Fields", "FunctionName", "AdditionalSignatures", });
+    com.google.protobuf.DescriptorProtos.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
index 9476304d9..16864cb5b 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
@@ -47,13 +47,6 @@ private SourceInfo(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sourceFiles_ = new java.util.ArrayList<com.google.protobuf.Any>();
@@ -63,6 +56,13 @@ private SourceInfo(
                 input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,6 +83,7 @@ private SourceInfo(
     return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_fieldAccessorTable
@@ -146,6 +147,7 @@ public com.google.protobuf.AnyOrBuilder getSourceFilesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -155,6 +157,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sourceFiles_.size(); i++) {
@@ -163,6 +166,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -280,6 +284,7 @@ public static com.google.api.SourceInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -287,6 +292,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.SourceInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -314,6 +320,7 @@ public static final class Builder extends
       return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_fieldAccessorTable
@@ -337,6 +344,7 @@ private void maybeForceBuilderInitialization() {
         getSourceFilesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sourceFilesBuilder_ == null) {
@@ -348,15 +356,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.SourceInfo getDefaultInstanceForType() {
       return com.google.api.SourceInfo.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.SourceInfo build() {
       com.google.api.SourceInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -365,6 +376,7 @@ public com.google.api.SourceInfo build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.SourceInfo buildPartial() {
       com.google.api.SourceInfo result = new com.google.api.SourceInfo(this);
       int from_bitField0_ = bitField0_;
@@ -381,32 +393,39 @@ public com.google.api.SourceInfo buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SourceInfo) {
         return mergeFrom((com.google.api.SourceInfo)other);
@@ -449,10 +468,12 @@ public Builder mergeFrom(com.google.api.SourceInfo other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -783,11 +804,13 @@ public com.google.protobuf.Any.Builder addSourceFilesBuilder(
       }
       return sourceFilesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -809,6 +832,7 @@ public static com.google.api.SourceInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<SourceInfo>
       PARSER = new com.google.protobuf.AbstractParser<SourceInfo>() {
+    @java.lang.Override
     public SourceInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -826,6 +850,7 @@ public com.google.protobuf.Parser<SourceInfo> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.SourceInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
index be724b694..ff74370be 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
@@ -51,13 +51,6 @@ private SystemParameter(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,6 +69,13 @@ private SystemParameter(
             urlQueryParameter_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,6 +93,7 @@ private SystemParameter(
     return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameter_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameter_fieldAccessorTable
@@ -231,6 +232,7 @@ public java.lang.String getUrlQueryParameter() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -240,6 +242,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -254,6 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,6 +386,7 @@ public static com.google.api.SystemParameter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -389,6 +394,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.SystemParameter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,6 +424,7 @@ public static final class Builder extends
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameter_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameter_fieldAccessorTable
@@ -440,6 +447,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -451,15 +459,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameter_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameter getDefaultInstanceForType() {
       return com.google.api.SystemParameter.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameter build() {
       com.google.api.SystemParameter result = buildPartial();
       if (!result.isInitialized()) {
@@ -468,6 +479,7 @@ public com.google.api.SystemParameter build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameter buildPartial() {
       com.google.api.SystemParameter result = new com.google.api.SystemParameter(this);
       result.name_ = name_;
@@ -477,32 +489,39 @@ public com.google.api.SystemParameter buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SystemParameter) {
         return mergeFrom((com.google.api.SystemParameter)other);
@@ -531,10 +550,12 @@ public Builder mergeFrom(com.google.api.SystemParameter other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -829,11 +850,13 @@ public Builder setUrlQueryParameterBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,6 +878,7 @@ public static com.google.api.SystemParameter getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<SystemParameter>
       PARSER = new com.google.protobuf.AbstractParser<SystemParameter>() {
+    @java.lang.Override
     public SystemParameter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -872,6 +896,7 @@ public com.google.protobuf.Parser<SystemParameter> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.SystemParameter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
index 73d700c84..add1d29ea 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
@@ -49,13 +49,6 @@ private SystemParameterRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -71,6 +64,13 @@ private SystemParameterRule(
                 input.readMessage(com.google.api.SystemParameter.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,6 +91,7 @@ private SystemParameterRule(
     return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameterRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameterRule_fieldAccessorTable
@@ -221,6 +222,7 @@ public com.google.api.SystemParameterOrBuilder getParametersOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -230,6 +232,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -241,6 +244,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -365,6 +369,7 @@ public static com.google.api.SystemParameterRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -372,6 +377,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.SystemParameterRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -400,6 +406,7 @@ public static final class Builder extends
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameterRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameterRule_fieldAccessorTable
@@ -423,6 +430,7 @@ private void maybeForceBuilderInitialization() {
         getParametersFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -436,15 +444,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameterRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameterRule getDefaultInstanceForType() {
       return com.google.api.SystemParameterRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameterRule build() {
       com.google.api.SystemParameterRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -453,6 +464,7 @@ public com.google.api.SystemParameterRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameterRule buildPartial() {
       com.google.api.SystemParameterRule result = new com.google.api.SystemParameterRule(this);
       int from_bitField0_ = bitField0_;
@@ -472,32 +484,39 @@ public com.google.api.SystemParameterRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SystemParameterRule) {
         return mergeFrom((com.google.api.SystemParameterRule)other);
@@ -544,10 +563,12 @@ public Builder mergeFrom(com.google.api.SystemParameterRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1049,11 +1070,13 @@ public com.google.api.SystemParameter.Builder addParametersBuilder(
       }
       return parametersBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1075,6 +1098,7 @@ public static com.google.api.SystemParameterRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<SystemParameterRule>
       PARSER = new com.google.protobuf.AbstractParser<SystemParameterRule>() {
+    @java.lang.Override
     public SystemParameterRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1092,6 +1116,7 @@ public com.google.protobuf.Parser<SystemParameterRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.SystemParameterRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
index c1fa4da9a..f4d1e0691 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
@@ -51,13 +51,6 @@ private SystemParameters(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               rules_ = new java.util.ArrayList<com.google.api.SystemParameterRule>();
@@ -67,6 +60,13 @@ private SystemParameters(
                 input.readMessage(com.google.api.SystemParameterRule.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -87,6 +87,7 @@ private SystemParameters(
     return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameters_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameters_fieldAccessorTable
@@ -255,6 +256,7 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -264,6 +266,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < rules_.size(); i++) {
@@ -272,6 +275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,6 +393,7 @@ public static com.google.api.SystemParameters parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -396,6 +401,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.SystemParameters prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -427,6 +433,7 @@ public static final class Builder extends
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameters_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameters_fieldAccessorTable
@@ -450,6 +457,7 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
@@ -461,15 +469,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.SystemParameterProto.internal_static_google_api_SystemParameters_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameters getDefaultInstanceForType() {
       return com.google.api.SystemParameters.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameters build() {
       com.google.api.SystemParameters result = buildPartial();
       if (!result.isInitialized()) {
@@ -478,6 +489,7 @@ public com.google.api.SystemParameters build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.SystemParameters buildPartial() {
       com.google.api.SystemParameters result = new com.google.api.SystemParameters(this);
       int from_bitField0_ = bitField0_;
@@ -494,32 +506,39 @@ public com.google.api.SystemParameters buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SystemParameters) {
         return mergeFrom((com.google.api.SystemParameters)other);
@@ -562,10 +581,12 @@ public Builder mergeFrom(com.google.api.SystemParameters other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1274,11 +1295,13 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder(
       }
       return rulesBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1300,6 +1323,7 @@ public static com.google.api.SystemParameters getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<SystemParameters>
       PARSER = new com.google.protobuf.AbstractParser<SystemParameters>() {
+    @java.lang.Override
     public SystemParameters parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1317,6 +1341,7 @@ public com.google.protobuf.Parser<SystemParameters> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.SystemParameters getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Usage.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Usage.java
index 374dcadd5..10dc5f215 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/Usage.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/Usage.java
@@ -49,13 +49,6 @@ private Usage(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -80,6 +73,13 @@ private Usage(
             producerNotificationChannel_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,6 +103,7 @@ private Usage(
     return com.google.api.UsageProto.internal_static_google_api_Usage_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.UsageProto.internal_static_google_api_Usage_fieldAccessorTable
@@ -279,6 +280,7 @@ public java.lang.String getProducerNotificationChannel() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,6 +290,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requirements_.size(); i++) {
@@ -302,6 +305,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -440,6 +444,7 @@ public static com.google.api.Usage parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -447,6 +452,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.Usage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -474,6 +480,7 @@ public static final class Builder extends
       return com.google.api.UsageProto.internal_static_google_api_Usage_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.UsageProto.internal_static_google_api_Usage_fieldAccessorTable
@@ -497,6 +504,7 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       requirements_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -512,15 +520,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.UsageProto.internal_static_google_api_Usage_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.Usage getDefaultInstanceForType() {
       return com.google.api.Usage.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.Usage build() {
       com.google.api.Usage result = buildPartial();
       if (!result.isInitialized()) {
@@ -529,6 +540,7 @@ public com.google.api.Usage build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.Usage buildPartial() {
       com.google.api.Usage result = new com.google.api.Usage(this);
       int from_bitField0_ = bitField0_;
@@ -553,32 +565,39 @@ public com.google.api.Usage buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Usage) {
         return mergeFrom((com.google.api.Usage)other);
@@ -635,10 +654,12 @@ public Builder mergeFrom(com.google.api.Usage other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1254,11 +1275,13 @@ public Builder setProducerNotificationChannelBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1280,6 +1303,7 @@ public static com.google.api.Usage getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Usage>
       PARSER = new com.google.protobuf.AbstractParser<Usage>() {
+    @java.lang.Override
     public Usage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1297,6 +1321,7 @@ public com.google.protobuf.Parser<Usage> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.Usage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java b/generated/java/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
index 21581f050..7765e5096 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
@@ -66,13 +66,6 @@ private UsageRule(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -89,6 +82,13 @@ private UsageRule(
             skipServiceControl_ = input.readBool();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -106,6 +106,7 @@ private UsageRule(
     return com.google.api.UsageProto.internal_static_google_api_UsageRule_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.api.UsageProto.internal_static_google_api_UsageRule_fieldAccessorTable
@@ -190,6 +191,7 @@ public boolean getSkipServiceControl() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,6 +201,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSelectorBytes().isEmpty()) {
@@ -213,6 +216,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,6 +349,7 @@ public static com.google.api.UsageRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -352,6 +357,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.api.UsageRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,6 +402,7 @@ public static final class Builder extends
       return com.google.api.UsageProto.internal_static_google_api_UsageRule_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.api.UsageProto.internal_static_google_api_UsageRule_fieldAccessorTable
@@ -418,6 +425,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selector_ = "";
@@ -429,15 +437,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.api.UsageProto.internal_static_google_api_UsageRule_descriptor;
     }
 
+    @java.lang.Override
     public com.google.api.UsageRule getDefaultInstanceForType() {
       return com.google.api.UsageRule.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.api.UsageRule build() {
       com.google.api.UsageRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -446,6 +457,7 @@ public com.google.api.UsageRule build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.api.UsageRule buildPartial() {
       com.google.api.UsageRule result = new com.google.api.UsageRule(this);
       result.selector_ = selector_;
@@ -455,32 +467,39 @@ public com.google.api.UsageRule buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.UsageRule) {
         return mergeFrom((com.google.api.UsageRule)other);
@@ -507,10 +526,12 @@ public Builder mergeFrom(com.google.api.UsageRule other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -715,11 +736,13 @@ public Builder clearSkipServiceControl() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -741,6 +764,7 @@ public static com.google.api.UsageRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<UsageRule>
       PARSER = new com.google.protobuf.AbstractParser<UsageRule>() {
+    @java.lang.Override
     public UsageRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,6 +782,7 @@ public com.google.protobuf.Parser<UsageRule> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.api.UsageRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java b/generated/java/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
index f9defeab6..40391fe77 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
@@ -62,13 +62,6 @@ private HttpRequest(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -159,6 +152,13 @@ private HttpRequest(
             protocol_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -176,6 +176,7 @@ private HttpRequest(
     return com.google.logging.type.HttpRequestProto.internal_static_google_logging_type_HttpRequest_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.type.HttpRequestProto.internal_static_google_logging_type_HttpRequest_fieldAccessorTable
@@ -624,6 +625,7 @@ public java.lang.String getProtocol() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -633,6 +635,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getRequestMethodBytes().isEmpty()) {
@@ -683,6 +686,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -914,6 +918,7 @@ public static com.google.logging.type.HttpRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -921,6 +926,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.type.HttpRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -950,6 +956,7 @@ public static final class Builder extends
       return com.google.logging.type.HttpRequestProto.internal_static_google_logging_type_HttpRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.type.HttpRequestProto.internal_static_google_logging_type_HttpRequest_fieldAccessorTable
@@ -972,6 +979,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       requestMethod_ = "";
@@ -1011,15 +1019,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.type.HttpRequestProto.internal_static_google_logging_type_HttpRequest_descriptor;
     }
 
+    @java.lang.Override
     public com.google.logging.type.HttpRequest getDefaultInstanceForType() {
       return com.google.logging.type.HttpRequest.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.logging.type.HttpRequest build() {
       com.google.logging.type.HttpRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1028,6 +1039,7 @@ public com.google.logging.type.HttpRequest build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.logging.type.HttpRequest buildPartial() {
       com.google.logging.type.HttpRequest result = new com.google.logging.type.HttpRequest(this);
       result.requestMethod_ = requestMethod_;
@@ -1053,32 +1065,39 @@ public com.google.logging.type.HttpRequest buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.type.HttpRequest) {
         return mergeFrom((com.google.logging.type.HttpRequest)other);
@@ -1147,10 +1166,12 @@ public Builder mergeFrom(com.google.logging.type.HttpRequest other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2270,11 +2291,13 @@ public Builder setProtocolBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2296,6 +2319,7 @@ public static com.google.logging.type.HttpRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<HttpRequest>
       PARSER = new com.google.protobuf.AbstractParser<HttpRequest>() {
+    @java.lang.Override
     public HttpRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2313,6 +2337,7 @@ public com.google.protobuf.Parser<HttpRequest> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.logging.type.HttpRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
index d8718c216..419f8e7cf 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
@@ -47,6 +47,12 @@ private CancelOperationRequest(
           case 0:
             done = true;
             break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -54,12 +60,6 @@ private CancelOperationRequest(
             }
             break;
           }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,6 +77,7 @@ private CancelOperationRequest(
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_CancelOperationRequest_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_CancelOperationRequest_fieldAccessorTable
@@ -127,6 +128,7 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -136,6 +138,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -144,6 +147,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -258,6 +262,7 @@ public static com.google.longrunning.CancelOperationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -265,6 +270,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.longrunning.CancelOperationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -292,6 +298,7 @@ public static final class Builder extends
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_CancelOperationRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_CancelOperationRequest_fieldAccessorTable
@@ -314,6 +321,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -321,15 +329,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_CancelOperationRequest_descriptor;
     }
 
+    @java.lang.Override
     public com.google.longrunning.CancelOperationRequest getDefaultInstanceForType() {
       return com.google.longrunning.CancelOperationRequest.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.longrunning.CancelOperationRequest build() {
       com.google.longrunning.CancelOperationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -338,6 +349,7 @@ public com.google.longrunning.CancelOperationRequest build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.longrunning.CancelOperationRequest buildPartial() {
       com.google.longrunning.CancelOperationRequest result = new com.google.longrunning.CancelOperationRequest(this);
       result.name_ = name_;
@@ -345,32 +357,39 @@ public com.google.longrunning.CancelOperationRequest buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.CancelOperationRequest) {
         return mergeFrom((com.google.longrunning.CancelOperationRequest)other);
@@ -391,10 +410,12 @@ public Builder mergeFrom(com.google.longrunning.CancelOperationRequest other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -501,11 +522,13 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -527,6 +550,7 @@ public static com.google.longrunning.CancelOperationRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser<CancelOperationRequest>
       PARSER = new com.google.protobuf.AbstractParser<CancelOperationRequest>() {
+    @java.lang.Override
     public CancelOperationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -544,6 +568,7 @@ public com.google.protobuf.Parser<CancelOperationRequest> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.longrunning.CancelOperationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
index 5d418c06a..b782e62c1 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
@@ -47,6 +47,12 @@ private DeleteOperationRequest(
           case 0:
             done = true;
             break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -54,12 +60,6 @@ private DeleteOperationRequest(
             }
             break;
           }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,6 +77,7 @@ private DeleteOperationRequest(
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_DeleteOperationRequest_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_DeleteOperationRequest_fieldAccessorTable
@@ -127,6 +128,7 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -136,6 +138,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -144,6 +147,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -258,6 +262,7 @@ public static com.google.longrunning.DeleteOperationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -265,6 +270,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.longrunning.DeleteOperationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -292,6 +298,7 @@ public static final class Builder extends
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_DeleteOperationRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_DeleteOperationRequest_fieldAccessorTable
@@ -314,6 +321,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -321,15 +329,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_DeleteOperationRequest_descriptor;
     }
 
+    @java.lang.Override
     public com.google.longrunning.DeleteOperationRequest getDefaultInstanceForType() {
       return com.google.longrunning.DeleteOperationRequest.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.longrunning.DeleteOperationRequest build() {
       com.google.longrunning.DeleteOperationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -338,6 +349,7 @@ public com.google.longrunning.DeleteOperationRequest build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.longrunning.DeleteOperationRequest buildPartial() {
       com.google.longrunning.DeleteOperationRequest result = new com.google.longrunning.DeleteOperationRequest(this);
       result.name_ = name_;
@@ -345,32 +357,39 @@ public com.google.longrunning.DeleteOperationRequest buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.DeleteOperationRequest) {
         return mergeFrom((com.google.longrunning.DeleteOperationRequest)other);
@@ -391,10 +410,12 @@ public Builder mergeFrom(com.google.longrunning.DeleteOperationRequest other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -501,11 +522,13 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -527,6 +550,7 @@ public static com.google.longrunning.DeleteOperationRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser<DeleteOperationRequest>
       PARSER = new com.google.protobuf.AbstractParser<DeleteOperationRequest>() {
+    @java.lang.Override
     public DeleteOperationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -544,6 +568,7 @@ public com.google.protobuf.Parser<DeleteOperationRequest> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.longrunning.DeleteOperationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
index 7a2f4ac9b..6d97c7e19 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
@@ -47,6 +47,12 @@ private GetOperationRequest(
           case 0:
             done = true;
             break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -54,12 +60,6 @@ private GetOperationRequest(
             }
             break;
           }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,6 +77,7 @@ private GetOperationRequest(
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_GetOperationRequest_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_GetOperationRequest_fieldAccessorTable
@@ -127,6 +128,7 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -136,6 +138,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -144,6 +147,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -258,6 +262,7 @@ public static com.google.longrunning.GetOperationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -265,6 +270,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.longrunning.GetOperationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -292,6 +298,7 @@ public static final class Builder extends
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_GetOperationRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_GetOperationRequest_fieldAccessorTable
@@ -314,6 +321,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -321,15 +329,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_GetOperationRequest_descriptor;
     }
 
+    @java.lang.Override
     public com.google.longrunning.GetOperationRequest getDefaultInstanceForType() {
       return com.google.longrunning.GetOperationRequest.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.longrunning.GetOperationRequest build() {
       com.google.longrunning.GetOperationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -338,6 +349,7 @@ public com.google.longrunning.GetOperationRequest build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.longrunning.GetOperationRequest buildPartial() {
       com.google.longrunning.GetOperationRequest result = new com.google.longrunning.GetOperationRequest(this);
       result.name_ = name_;
@@ -345,32 +357,39 @@ public com.google.longrunning.GetOperationRequest buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.GetOperationRequest) {
         return mergeFrom((com.google.longrunning.GetOperationRequest)other);
@@ -391,10 +410,12 @@ public Builder mergeFrom(com.google.longrunning.GetOperationRequest other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -501,11 +522,13 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -527,6 +550,7 @@ public static com.google.longrunning.GetOperationRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<GetOperationRequest>
       PARSER = new com.google.protobuf.AbstractParser<GetOperationRequest>() {
+    @java.lang.Override
     public GetOperationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -544,6 +568,7 @@ public com.google.protobuf.Parser<GetOperationRequest> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.longrunning.GetOperationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
index 46e91fe41..50e968478 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
@@ -50,13 +50,6 @@ private ListOperationsRequest(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,6 +73,13 @@ private ListOperationsRequest(
             name_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,6 +97,7 @@ private ListOperationsRequest(
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsRequest_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsRequest_fieldAccessorTable
@@ -244,6 +245,7 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -253,6 +255,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFilterBytes().isEmpty()) {
@@ -270,6 +273,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -406,6 +410,7 @@ public static com.google.longrunning.ListOperationsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -413,6 +418,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.longrunning.ListOperationsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -440,6 +446,7 @@ public static final class Builder extends
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsRequest_fieldAccessorTable
@@ -462,6 +469,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -475,15 +483,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsRequest_descriptor;
     }
 
+    @java.lang.Override
     public com.google.longrunning.ListOperationsRequest getDefaultInstanceForType() {
       return com.google.longrunning.ListOperationsRequest.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.longrunning.ListOperationsRequest build() {
       com.google.longrunning.ListOperationsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,6 +503,7 @@ public com.google.longrunning.ListOperationsRequest build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.longrunning.ListOperationsRequest buildPartial() {
       com.google.longrunning.ListOperationsRequest result = new com.google.longrunning.ListOperationsRequest(this);
       result.name_ = name_;
@@ -502,32 +514,39 @@ public com.google.longrunning.ListOperationsRequest buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.ListOperationsRequest) {
         return mergeFrom((com.google.longrunning.ListOperationsRequest)other);
@@ -559,10 +578,12 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsRequest other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -885,11 +906,13 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -911,6 +934,7 @@ public static com.google.longrunning.ListOperationsRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser<ListOperationsRequest>
       PARSER = new com.google.protobuf.AbstractParser<ListOperationsRequest>() {
+    @java.lang.Override
     public ListOperationsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -928,6 +952,7 @@ public com.google.protobuf.Parser<ListOperationsRequest> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.longrunning.ListOperationsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
index a5df418ad..ac0a0b143 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
@@ -48,13 +48,6 @@ private ListOperationsResponse(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               operations_ = new java.util.ArrayList<com.google.longrunning.Operation>();
@@ -70,6 +63,13 @@ private ListOperationsResponse(
             nextPageToken_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,6 +90,7 @@ private ListOperationsResponse(
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsResponse_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsResponse_fieldAccessorTable
@@ -196,6 +197,7 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -205,6 +207,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < operations_.size(); i++) {
@@ -216,6 +219,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -340,6 +344,7 @@ public static com.google.longrunning.ListOperationsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -347,6 +352,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.longrunning.ListOperationsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -374,6 +380,7 @@ public static final class Builder extends
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsResponse_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsResponse_fieldAccessorTable
@@ -397,6 +404,7 @@ private void maybeForceBuilderInitialization() {
         getOperationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (operationsBuilder_ == null) {
@@ -410,15 +418,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_ListOperationsResponse_descriptor;
     }
 
+    @java.lang.Override
     public com.google.longrunning.ListOperationsResponse getDefaultInstanceForType() {
       return com.google.longrunning.ListOperationsResponse.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.longrunning.ListOperationsResponse build() {
       com.google.longrunning.ListOperationsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,6 +438,7 @@ public com.google.longrunning.ListOperationsResponse build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.longrunning.ListOperationsResponse buildPartial() {
       com.google.longrunning.ListOperationsResponse result = new com.google.longrunning.ListOperationsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -446,32 +458,39 @@ public com.google.longrunning.ListOperationsResponse buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.ListOperationsResponse) {
         return mergeFrom((com.google.longrunning.ListOperationsResponse)other);
@@ -518,10 +537,12 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsResponse other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -941,11 +962,13 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -967,6 +990,7 @@ public static com.google.longrunning.ListOperationsResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser<ListOperationsResponse>
       PARSER = new com.google.protobuf.AbstractParser<ListOperationsResponse>() {
+    @java.lang.Override
     public ListOperationsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -984,6 +1008,7 @@ public com.google.protobuf.Parser<ListOperationsResponse> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.longrunning.ListOperationsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
index 0bf71d121..9108aee67 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
@@ -49,13 +49,6 @@ private Operation(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -108,6 +101,13 @@ private Operation(
             resultCase_ = 5;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -125,6 +125,7 @@ private Operation(
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_Operation_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.longrunning.OperationsProto.internal_static_google_longrunning_Operation_fieldAccessorTable
@@ -371,6 +372,7 @@ public com.google.protobuf.AnyOrBuilder getResponseOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -380,6 +382,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -400,6 +403,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -571,6 +575,7 @@ public static com.google.longrunning.Operation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -578,6 +583,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.longrunning.Operation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -606,6 +612,7 @@ public static final class Builder extends
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_Operation_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_Operation_fieldAccessorTable
@@ -628,6 +635,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -645,15 +653,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.longrunning.OperationsProto.internal_static_google_longrunning_Operation_descriptor;
     }
 
+    @java.lang.Override
     public com.google.longrunning.Operation getDefaultInstanceForType() {
       return com.google.longrunning.Operation.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.longrunning.Operation build() {
       com.google.longrunning.Operation result = buildPartial();
       if (!result.isInitialized()) {
@@ -662,6 +673,7 @@ public com.google.longrunning.Operation build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.longrunning.Operation buildPartial() {
       com.google.longrunning.Operation result = new com.google.longrunning.Operation(this);
       result.name_ = name_;
@@ -690,32 +702,39 @@ public com.google.longrunning.Operation buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.Operation) {
         return mergeFrom((com.google.longrunning.Operation)other);
@@ -755,10 +774,12 @@ public Builder mergeFrom(com.google.longrunning.Operation other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1521,11 +1542,13 @@ public com.google.protobuf.AnyOrBuilder getResponseOrBuilder() {
       onChanged();;
       return responseBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1547,6 +1570,7 @@ public static com.google.longrunning.Operation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Operation>
       PARSER = new com.google.protobuf.AbstractParser<Operation>() {
+    @java.lang.Override
     public Operation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1564,6 +1588,7 @@ public com.google.protobuf.Parser<Operation> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.longrunning.Operation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationTypes.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationTypes.java
new file mode 100644
index 000000000..ec4f3df78
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationTypes.java
@@ -0,0 +1,760 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/longrunning/operations.proto
+
+package com.google.longrunning;
+
+/**
+ * <pre>
+ * The protocol buffer types used to indirectly support this method.
+ * </pre>
+ *
+ * Protobuf type {@code google.longrunning.OperationTypes}
+ */
+public  final class OperationTypes extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.longrunning.OperationTypes)
+    OperationTypesOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use OperationTypes.newBuilder() to construct.
+  private OperationTypes(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private OperationTypes() {
+    response_ = "";
+    metadata_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private OperationTypes(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            response_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            metadata_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.longrunning.OperationsProto.internal_static_google_longrunning_OperationTypes_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.longrunning.OperationsProto.internal_static_google_longrunning_OperationTypes_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.longrunning.OperationTypes.class, com.google.longrunning.OperationTypes.Builder.class);
+  }
+
+  public static final int RESPONSE_FIELD_NUMBER = 1;
+  private volatile java.lang.Object response_;
+  /**
+   * <pre>
+   * Required. The message name of the primary return type for this
+   * long-running operation.
+   * This type will be used to deserialize the LRO's response.
+   * If the response is in a different package from the rpc, a fully-qualified
+   * message name must be used (e.g. "google.protobuf.Empty").
+   * </pre>
+   *
+   * <code>string response = 1;</code>
+   */
+  public java.lang.String getResponse() {
+    java.lang.Object ref = response_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      response_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * Required. The message name of the primary return type for this
+   * long-running operation.
+   * This type will be used to deserialize the LRO's response.
+   * If the response is in a different package from the rpc, a fully-qualified
+   * message name must be used (e.g. "google.protobuf.Empty").
+   * </pre>
+   *
+   * <code>string response = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getResponseBytes() {
+    java.lang.Object ref = response_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      response_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int METADATA_FIELD_NUMBER = 2;
+  private volatile java.lang.Object metadata_;
+  /**
+   * <pre>
+   * The metadata message name for this long-running operation.
+   * </pre>
+   *
+   * <code>string metadata = 2;</code>
+   */
+  public java.lang.String getMetadata() {
+    java.lang.Object ref = metadata_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      metadata_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The metadata message name for this long-running operation.
+   * </pre>
+   *
+   * <code>string metadata = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getMetadataBytes() {
+    java.lang.Object ref = metadata_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      metadata_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getResponseBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, response_);
+    }
+    if (!getMetadataBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, metadata_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getResponseBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, response_);
+    }
+    if (!getMetadataBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, metadata_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.longrunning.OperationTypes)) {
+      return super.equals(obj);
+    }
+    com.google.longrunning.OperationTypes other = (com.google.longrunning.OperationTypes) obj;
+
+    boolean result = true;
+    result = result && getResponse()
+        .equals(other.getResponse());
+    result = result && getMetadata()
+        .equals(other.getMetadata());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + RESPONSE_FIELD_NUMBER;
+    hash = (53 * hash) + getResponse().hashCode();
+    hash = (37 * hash) + METADATA_FIELD_NUMBER;
+    hash = (53 * hash) + getMetadata().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.longrunning.OperationTypes parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.longrunning.OperationTypes parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.longrunning.OperationTypes parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.longrunning.OperationTypes parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.longrunning.OperationTypes prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * The protocol buffer types used to indirectly support this method.
+   * </pre>
+   *
+   * Protobuf type {@code google.longrunning.OperationTypes}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:google.longrunning.OperationTypes)
+      com.google.longrunning.OperationTypesOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.longrunning.OperationsProto.internal_static_google_longrunning_OperationTypes_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.longrunning.OperationsProto.internal_static_google_longrunning_OperationTypes_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.longrunning.OperationTypes.class, com.google.longrunning.OperationTypes.Builder.class);
+    }
+
+    // Construct using com.google.longrunning.OperationTypes.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      response_ = "";
+
+      metadata_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.longrunning.OperationsProto.internal_static_google_longrunning_OperationTypes_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.longrunning.OperationTypes getDefaultInstanceForType() {
+      return com.google.longrunning.OperationTypes.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.longrunning.OperationTypes build() {
+      com.google.longrunning.OperationTypes result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.longrunning.OperationTypes buildPartial() {
+      com.google.longrunning.OperationTypes result = new com.google.longrunning.OperationTypes(this);
+      result.response_ = response_;
+      result.metadata_ = metadata_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.longrunning.OperationTypes) {
+        return mergeFrom((com.google.longrunning.OperationTypes)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.longrunning.OperationTypes other) {
+      if (other == com.google.longrunning.OperationTypes.getDefaultInstance()) return this;
+      if (!other.getResponse().isEmpty()) {
+        response_ = other.response_;
+        onChanged();
+      }
+      if (!other.getMetadata().isEmpty()) {
+        metadata_ = other.metadata_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.longrunning.OperationTypes parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.OperationTypes) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object response_ = "";
+    /**
+     * <pre>
+     * Required. The message name of the primary return type for this
+     * long-running operation.
+     * This type will be used to deserialize the LRO's response.
+     * If the response is in a different package from the rpc, a fully-qualified
+     * message name must be used (e.g. "google.protobuf.Empty").
+     * </pre>
+     *
+     * <code>string response = 1;</code>
+     */
+    public java.lang.String getResponse() {
+      java.lang.Object ref = response_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        response_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Required. The message name of the primary return type for this
+     * long-running operation.
+     * This type will be used to deserialize the LRO's response.
+     * If the response is in a different package from the rpc, a fully-qualified
+     * message name must be used (e.g. "google.protobuf.Empty").
+     * </pre>
+     *
+     * <code>string response = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getResponseBytes() {
+      java.lang.Object ref = response_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        response_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Required. The message name of the primary return type for this
+     * long-running operation.
+     * This type will be used to deserialize the LRO's response.
+     * If the response is in a different package from the rpc, a fully-qualified
+     * message name must be used (e.g. "google.protobuf.Empty").
+     * </pre>
+     *
+     * <code>string response = 1;</code>
+     */
+    public Builder setResponse(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      response_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Required. The message name of the primary return type for this
+     * long-running operation.
+     * This type will be used to deserialize the LRO's response.
+     * If the response is in a different package from the rpc, a fully-qualified
+     * message name must be used (e.g. "google.protobuf.Empty").
+     * </pre>
+     *
+     * <code>string response = 1;</code>
+     */
+    public Builder clearResponse() {
+      
+      response_ = getDefaultInstance().getResponse();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Required. The message name of the primary return type for this
+     * long-running operation.
+     * This type will be used to deserialize the LRO's response.
+     * If the response is in a different package from the rpc, a fully-qualified
+     * message name must be used (e.g. "google.protobuf.Empty").
+     * </pre>
+     *
+     * <code>string response = 1;</code>
+     */
+    public Builder setResponseBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      response_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object metadata_ = "";
+    /**
+     * <pre>
+     * The metadata message name for this long-running operation.
+     * </pre>
+     *
+     * <code>string metadata = 2;</code>
+     */
+    public java.lang.String getMetadata() {
+      java.lang.Object ref = metadata_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        metadata_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The metadata message name for this long-running operation.
+     * </pre>
+     *
+     * <code>string metadata = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMetadataBytes() {
+      java.lang.Object ref = metadata_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        metadata_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The metadata message name for this long-running operation.
+     * </pre>
+     *
+     * <code>string metadata = 2;</code>
+     */
+    public Builder setMetadata(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      metadata_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The metadata message name for this long-running operation.
+     * </pre>
+     *
+     * <code>string metadata = 2;</code>
+     */
+    public Builder clearMetadata() {
+      
+      metadata_ = getDefaultInstance().getMetadata();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The metadata message name for this long-running operation.
+     * </pre>
+     *
+     * <code>string metadata = 2;</code>
+     */
+    public Builder setMetadataBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      metadata_ = value;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.longrunning.OperationTypes)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.longrunning.OperationTypes)
+  private static final com.google.longrunning.OperationTypes DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.longrunning.OperationTypes();
+  }
+
+  public static com.google.longrunning.OperationTypes getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<OperationTypes>
+      PARSER = new com.google.protobuf.AbstractParser<OperationTypes>() {
+    @java.lang.Override
+    public OperationTypes parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new OperationTypes(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<OperationTypes> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<OperationTypes> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.longrunning.OperationTypes getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationTypesOrBuilder.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationTypesOrBuilder.java
new file mode 100644
index 000000000..7ad8e3f1b
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationTypesOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/longrunning/operations.proto
+
+package com.google.longrunning;
+
+public interface OperationTypesOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.longrunning.OperationTypes)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * Required. The message name of the primary return type for this
+   * long-running operation.
+   * This type will be used to deserialize the LRO's response.
+   * If the response is in a different package from the rpc, a fully-qualified
+   * message name must be used (e.g. "google.protobuf.Empty").
+   * </pre>
+   *
+   * <code>string response = 1;</code>
+   */
+  java.lang.String getResponse();
+  /**
+   * <pre>
+   * Required. The message name of the primary return type for this
+   * long-running operation.
+   * This type will be used to deserialize the LRO's response.
+   * If the response is in a different package from the rpc, a fully-qualified
+   * message name must be used (e.g. "google.protobuf.Empty").
+   * </pre>
+   *
+   * <code>string response = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getResponseBytes();
+
+  /**
+   * <pre>
+   * The metadata message name for this long-running operation.
+   * </pre>
+   *
+   * <code>string metadata = 2;</code>
+   */
+  java.lang.String getMetadata();
+  /**
+   * <pre>
+   * The metadata message name for this long-running operation.
+   * </pre>
+   *
+   * <code>string metadata = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getMetadataBytes();
+}
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java
index 7b75680df..48e4d2e30 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java
@@ -7,6 +7,7 @@ public final class OperationsProto {
   private OperationsProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(com.google.longrunning.OperationsProto.operationTypes);
   }
 
   public static void registerAllExtensions(
@@ -14,6 +15,23 @@ public static void registerAllExtensions(
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
+  public static final int OPERATION_TYPES_FIELD_NUMBER = 1049;
+  /**
+   * <pre>
+   * The types that are returned from long-running operations.
+   * Required for methods that return google.longrunning.Operation; invalid
+   * otherwise.
+   * </pre>
+   *
+   * <code>extend .google.protobuf.MethodOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.MethodOptions,
+      com.google.longrunning.OperationTypes> operationTypes = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        com.google.longrunning.OperationTypes.class,
+        com.google.longrunning.OperationTypes.getDefaultInstance());
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_google_longrunning_Operation_descriptor;
   static final 
@@ -44,6 +62,11 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_longrunning_DeleteOperationRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_longrunning_OperationTypes_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_longrunning_OperationTypes_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -55,38 +78,42 @@ public static void registerAllExtensions(
     java.lang.String[] descriptorData = {
       "\n#google/longrunning/operations.proto\022\022g" +
       "oogle.longrunning\032\034google/api/annotation" +
-      "s.proto\032\031google/protobuf/any.proto\032\033goog" +
-      "le/protobuf/empty.proto\032\027google/rpc/stat" +
-      "us.proto\"\250\001\n\tOperation\022\014\n\004name\030\001 \001(\t\022&\n\010" +
-      "metadata\030\002 \001(\0132\024.google.protobuf.Any\022\014\n\004" +
-      "done\030\003 \001(\010\022#\n\005error\030\004 \001(\0132\022.google.rpc.S" +
-      "tatusH\000\022(\n\010response\030\005 \001(\0132\024.google.proto" +
-      "buf.AnyH\000B\010\n\006result\"#\n\023GetOperationReque" +
-      "st\022\014\n\004name\030\001 \001(\t\"\\\n\025ListOperationsReques" +
-      "t\022\014\n\004name\030\004 \001(\t\022\016\n\006filter\030\001 \001(\t\022\021\n\tpage_" +
-      "size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"d\n\026ListOp" +
-      "erationsResponse\0221\n\noperations\030\001 \003(\0132\035.g" +
-      "oogle.longrunning.Operation\022\027\n\017next_page" +
-      "_token\030\002 \001(\t\"&\n\026CancelOperationRequest\022\014" +
-      "\n\004name\030\001 \001(\t\"&\n\026DeleteOperationRequest\022\014" +
-      "\n\004name\030\001 \001(\t2\214\004\n\nOperations\022\206\001\n\016ListOper" +
-      "ations\022).google.longrunning.ListOperatio" +
-      "nsRequest\032*.google.longrunning.ListOpera" +
-      "tionsResponse\"\035\202\323\344\223\002\027\022\025/v1/{name=operati" +
-      "ons}\022x\n\014GetOperation\022\'.google.longrunnin" +
-      "g.GetOperationRequest\032\035.google.longrunni" +
-      "ng.Operation\" \202\323\344\223\002\032\022\030/v1/{name=operatio" +
-      "ns/**}\022w\n\017DeleteOperation\022*.google.longr" +
-      "unning.DeleteOperationRequest\032\026.google.p" +
-      "rotobuf.Empty\" \202\323\344\223\002\032*\030/v1/{name=operati" +
-      "ons/**}\022\201\001\n\017CancelOperation\022*.google.lon" +
-      "grunning.CancelOperationRequest\032\026.google" +
-      ".protobuf.Empty\"*\202\323\344\223\002$\"\037/v1/{name=opera" +
-      "tions/**}:cancel:\001*B\224\001\n\026com.google.longr" +
-      "unningB\017OperationsProtoP\001Z=google.golang" +
-      ".org/genproto/googleapis/longrunning;lon" +
-      "grunning\252\002\022Google.LongRunning\312\002\022Google\\L" +
-      "ongRunningb\006proto3"
+      "s.proto\032\031google/protobuf/any.proto\032 goog" +
+      "le/protobuf/descriptor.proto\032\033google/pro" +
+      "tobuf/empty.proto\032\027google/rpc/status.pro" +
+      "to\"\250\001\n\tOperation\022\014\n\004name\030\001 \001(\t\022&\n\010metada" +
+      "ta\030\002 \001(\0132\024.google.protobuf.Any\022\014\n\004done\030\003" +
+      " \001(\010\022#\n\005error\030\004 \001(\0132\022.google.rpc.StatusH" +
+      "\000\022(\n\010response\030\005 \001(\0132\024.google.protobuf.An" +
+      "yH\000B\010\n\006result\"#\n\023GetOperationRequest\022\014\n\004" +
+      "name\030\001 \001(\t\"\\\n\025ListOperationsRequest\022\014\n\004n" +
+      "ame\030\004 \001(\t\022\016\n\006filter\030\001 \001(\t\022\021\n\tpage_size\030\002" +
+      " \001(\005\022\022\n\npage_token\030\003 \001(\t\"d\n\026ListOperatio" +
+      "nsResponse\0221\n\noperations\030\001 \003(\0132\035.google." +
+      "longrunning.Operation\022\027\n\017next_page_token" +
+      "\030\002 \001(\t\"&\n\026CancelOperationRequest\022\014\n\004name" +
+      "\030\001 \001(\t\"&\n\026DeleteOperationRequest\022\014\n\004name" +
+      "\030\001 \001(\t\"4\n\016OperationTypes\022\020\n\010response\030\001 \001" +
+      "(\t\022\020\n\010metadata\030\002 \001(\t2\214\004\n\nOperations\022\206\001\n\016" +
+      "ListOperations\022).google.longrunning.List" +
+      "OperationsRequest\032*.google.longrunning.L" +
+      "istOperationsResponse\"\035\202\323\344\223\002\027\022\025/v1/{name" +
+      "=operations}\022x\n\014GetOperation\022\'.google.lo" +
+      "ngrunning.GetOperationRequest\032\035.google.l" +
+      "ongrunning.Operation\" \202\323\344\223\002\032\022\030/v1/{name=" +
+      "operations/**}\022w\n\017DeleteOperation\022*.goog" +
+      "le.longrunning.DeleteOperationRequest\032\026." +
+      "google.protobuf.Empty\" \202\323\344\223\002\032*\030/v1/{name" +
+      "=operations/**}\022\201\001\n\017CancelOperation\022*.go" +
+      "ogle.longrunning.CancelOperationRequest\032" +
+      "\026.google.protobuf.Empty\"*\202\323\344\223\002$\"\037/v1/{na" +
+      "me=operations/**}:cancel:\001*:\\\n\017operation" +
+      "_types\022\036.google.protobuf.MethodOptions\030\231" +
+      "\010 \001(\0132\".google.longrunning.OperationType" +
+      "sB\224\001\n\026com.google.longrunningB\017Operations" +
+      "ProtoP\001Z=google.golang.org/genproto/goog" +
+      "leapis/longrunning;longrunning\252\002\022Google." +
+      "LongRunning\312\002\022Google\\LongRunningb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -101,6 +128,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           com.google.api.AnnotationsProto.getDescriptor(),
           com.google.protobuf.AnyProto.getDescriptor(),
+          com.google.protobuf.DescriptorProtos.getDescriptor(),
           com.google.protobuf.EmptyProto.getDescriptor(),
           com.google.rpc.StatusProto.getDescriptor(),
         }, assigner);
@@ -140,6 +168,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_longrunning_DeleteOperationRequest_descriptor,
         new java.lang.String[] { "Name", });
+    internal_static_google_longrunning_OperationTypes_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_google_longrunning_OperationTypes_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_longrunning_OperationTypes_descriptor,
+        new java.lang.String[] { "Response", "Metadata", });
+    operationTypes.internalInit(descriptor.getExtensions().get(0));
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.AnnotationsProto.http);
@@ -147,6 +182,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
         .internalUpdateFileDescriptor(descriptor, registry);
     com.google.api.AnnotationsProto.getDescriptor();
     com.google.protobuf.AnyProto.getDescriptor();
+    com.google.protobuf.DescriptorProtos.getDescriptor();
     com.google.protobuf.EmptyProto.getDescriptor();
     com.google.rpc.StatusProto.getDescriptor();
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
index 9d9897dc0..82357f0ce 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
@@ -48,13 +48,6 @@ private BadRequest(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               fieldViolations_ = new java.util.ArrayList<com.google.rpc.BadRequest.FieldViolation>();
@@ -64,6 +57,13 @@ private BadRequest(
                 input.readMessage(com.google.rpc.BadRequest.FieldViolation.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,6 +84,7 @@ private BadRequest(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_fieldAccessorTable
@@ -180,13 +181,6 @@ private FieldViolation(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -199,6 +193,13 @@ private FieldViolation(
               description_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -216,6 +217,7 @@ private FieldViolation(
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_FieldViolation_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_FieldViolation_fieldAccessorTable
@@ -312,6 +314,7 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -321,6 +324,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getFieldBytes().isEmpty()) {
@@ -332,6 +336,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -453,6 +458,7 @@ public static com.google.rpc.BadRequest.FieldViolation parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -460,6 +466,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.rpc.BadRequest.FieldViolation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -487,6 +494,7 @@ public static final class Builder extends
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_FieldViolation_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_FieldViolation_fieldAccessorTable
@@ -509,6 +517,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         field_ = "";
@@ -518,15 +527,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_FieldViolation_descriptor;
       }
 
+      @java.lang.Override
       public com.google.rpc.BadRequest.FieldViolation getDefaultInstanceForType() {
         return com.google.rpc.BadRequest.FieldViolation.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.rpc.BadRequest.FieldViolation build() {
         com.google.rpc.BadRequest.FieldViolation result = buildPartial();
         if (!result.isInitialized()) {
@@ -535,6 +547,7 @@ public com.google.rpc.BadRequest.FieldViolation build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.rpc.BadRequest.FieldViolation buildPartial() {
         com.google.rpc.BadRequest.FieldViolation result = new com.google.rpc.BadRequest.FieldViolation(this);
         result.field_ = field_;
@@ -543,32 +556,39 @@ public com.google.rpc.BadRequest.FieldViolation buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.BadRequest.FieldViolation) {
           return mergeFrom((com.google.rpc.BadRequest.FieldViolation)other);
@@ -593,10 +613,12 @@ public Builder mergeFrom(com.google.rpc.BadRequest.FieldViolation other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -802,11 +824,13 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -828,6 +852,7 @@ public static com.google.rpc.BadRequest.FieldViolation getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<FieldViolation>
         PARSER = new com.google.protobuf.AbstractParser<FieldViolation>() {
+      @java.lang.Override
       public FieldViolation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -845,6 +870,7 @@ public com.google.protobuf.Parser<FieldViolation> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.rpc.BadRequest.FieldViolation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -907,6 +933,7 @@ public com.google.rpc.BadRequest.FieldViolationOrBuilder getFieldViolationsOrBui
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -916,6 +943,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < fieldViolations_.size(); i++) {
@@ -924,6 +952,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1041,6 +1070,7 @@ public static com.google.rpc.BadRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1048,6 +1078,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.BadRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1076,6 +1107,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_fieldAccessorTable
@@ -1099,6 +1131,7 @@ private void maybeForceBuilderInitialization() {
         getFieldViolationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (fieldViolationsBuilder_ == null) {
@@ -1110,15 +1143,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.BadRequest getDefaultInstanceForType() {
       return com.google.rpc.BadRequest.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.BadRequest build() {
       com.google.rpc.BadRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1127,6 +1163,7 @@ public com.google.rpc.BadRequest build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.BadRequest buildPartial() {
       com.google.rpc.BadRequest result = new com.google.rpc.BadRequest(this);
       int from_bitField0_ = bitField0_;
@@ -1143,32 +1180,39 @@ public com.google.rpc.BadRequest buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.BadRequest) {
         return mergeFrom((com.google.rpc.BadRequest)other);
@@ -1211,10 +1255,12 @@ public Builder mergeFrom(com.google.rpc.BadRequest other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1545,11 +1591,13 @@ public com.google.rpc.BadRequest.FieldViolation.Builder addFieldViolationsBuilde
       }
       return fieldViolationsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1571,6 +1619,7 @@ public static com.google.rpc.BadRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<BadRequest>
       PARSER = new com.google.protobuf.AbstractParser<BadRequest>() {
+    @java.lang.Override
     public BadRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1588,6 +1637,7 @@ public com.google.protobuf.Parser<BadRequest> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.BadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
index 46dbc4848..7b9277665 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
@@ -48,13 +48,6 @@ private DebugInfo(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -70,6 +63,13 @@ private DebugInfo(
             detail_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,6 +90,7 @@ private DebugInfo(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_fieldAccessorTable
@@ -186,6 +187,7 @@ public java.lang.String getDetail() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,6 +197,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < stackEntries_.size(); i++) {
@@ -206,6 +209,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -334,6 +338,7 @@ public static com.google.rpc.DebugInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,6 +346,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.DebugInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -368,6 +374,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_fieldAccessorTable
@@ -390,6 +397,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       stackEntries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -399,15 +407,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.DebugInfo getDefaultInstanceForType() {
       return com.google.rpc.DebugInfo.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.DebugInfo build() {
       com.google.rpc.DebugInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,6 +427,7 @@ public com.google.rpc.DebugInfo build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.DebugInfo buildPartial() {
       com.google.rpc.DebugInfo result = new com.google.rpc.DebugInfo(this);
       int from_bitField0_ = bitField0_;
@@ -431,32 +443,39 @@ public com.google.rpc.DebugInfo buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.DebugInfo) {
         return mergeFrom((com.google.rpc.DebugInfo)other);
@@ -487,10 +506,12 @@ public Builder mergeFrom(com.google.rpc.DebugInfo other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -728,11 +749,13 @@ public Builder setDetailBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -754,6 +777,7 @@ public static com.google.rpc.DebugInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<DebugInfo>
       PARSER = new com.google.protobuf.AbstractParser<DebugInfo>() {
+    @java.lang.Override
     public DebugInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -771,6 +795,7 @@ public com.google.protobuf.Parser<DebugInfo> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.DebugInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Help.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
index bc3c8e08c..d18912be1 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
@@ -50,13 +50,6 @@ private Help(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               links_ = new java.util.ArrayList<com.google.rpc.Help.Link>();
@@ -66,6 +59,13 @@ private Help(
                 input.readMessage(com.google.rpc.Help.Link.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -86,6 +86,7 @@ private Help(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_fieldAccessorTable
@@ -178,13 +179,6 @@ private Link(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -197,6 +191,13 @@ private Link(
               url_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -214,6 +215,7 @@ private Link(
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_fieldAccessorTable
@@ -306,6 +308,7 @@ public java.lang.String getUrl() {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -315,6 +318,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getDescriptionBytes().isEmpty()) {
@@ -326,6 +330,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -447,6 +452,7 @@ public static com.google.rpc.Help.Link parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -454,6 +460,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.rpc.Help.Link prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -481,6 +488,7 @@ public static final class Builder extends
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_fieldAccessorTable
@@ -503,6 +511,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         description_ = "";
@@ -512,15 +521,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_descriptor;
       }
 
+      @java.lang.Override
       public com.google.rpc.Help.Link getDefaultInstanceForType() {
         return com.google.rpc.Help.Link.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.rpc.Help.Link build() {
         com.google.rpc.Help.Link result = buildPartial();
         if (!result.isInitialized()) {
@@ -529,6 +541,7 @@ public com.google.rpc.Help.Link build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.rpc.Help.Link buildPartial() {
         com.google.rpc.Help.Link result = new com.google.rpc.Help.Link(this);
         result.description_ = description_;
@@ -537,32 +550,39 @@ public com.google.rpc.Help.Link buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.Help.Link) {
           return mergeFrom((com.google.rpc.Help.Link)other);
@@ -587,10 +607,12 @@ public Builder mergeFrom(com.google.rpc.Help.Link other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -786,11 +808,13 @@ public Builder setUrlBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -812,6 +836,7 @@ public static com.google.rpc.Help.Link getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<Link>
         PARSER = new com.google.protobuf.AbstractParser<Link>() {
+      @java.lang.Override
       public Link parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -829,6 +854,7 @@ public com.google.protobuf.Parser<Link> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.rpc.Help.Link getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -891,6 +917,7 @@ public com.google.rpc.Help.LinkOrBuilder getLinksOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -900,6 +927,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < links_.size(); i++) {
@@ -908,6 +936,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1025,6 +1054,7 @@ public static com.google.rpc.Help parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1032,6 +1062,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.Help prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1062,6 +1093,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_fieldAccessorTable
@@ -1085,6 +1117,7 @@ private void maybeForceBuilderInitialization() {
         getLinksFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (linksBuilder_ == null) {
@@ -1096,15 +1129,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.Help getDefaultInstanceForType() {
       return com.google.rpc.Help.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.Help build() {
       com.google.rpc.Help result = buildPartial();
       if (!result.isInitialized()) {
@@ -1113,6 +1149,7 @@ public com.google.rpc.Help build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.Help buildPartial() {
       com.google.rpc.Help result = new com.google.rpc.Help(this);
       int from_bitField0_ = bitField0_;
@@ -1129,32 +1166,39 @@ public com.google.rpc.Help buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.Help) {
         return mergeFrom((com.google.rpc.Help)other);
@@ -1197,10 +1241,12 @@ public Builder mergeFrom(com.google.rpc.Help other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1531,11 +1577,13 @@ public com.google.rpc.Help.Link.Builder addLinksBuilder(
       }
       return linksBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1557,6 +1605,7 @@ public static com.google.rpc.Help getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Help>
       PARSER = new com.google.protobuf.AbstractParser<Help>() {
+    @java.lang.Override
     public Help parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1574,6 +1623,7 @@ public com.google.protobuf.Parser<Help> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.Help getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
index a64a21e09..19b9414d1 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
@@ -49,13 +49,6 @@ private LocalizedMessage(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,6 +61,13 @@ private LocalizedMessage(
             message_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,6 +85,7 @@ private LocalizedMessage(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_fieldAccessorTable
@@ -181,6 +182,7 @@ public java.lang.String getMessage() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,6 +192,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLocaleBytes().isEmpty()) {
@@ -201,6 +204,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -322,6 +326,7 @@ public static com.google.rpc.LocalizedMessage parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,6 +334,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.LocalizedMessage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,6 +363,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_fieldAccessorTable
@@ -379,6 +386,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       locale_ = "";
@@ -388,15 +396,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.LocalizedMessage getDefaultInstanceForType() {
       return com.google.rpc.LocalizedMessage.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.LocalizedMessage build() {
       com.google.rpc.LocalizedMessage result = buildPartial();
       if (!result.isInitialized()) {
@@ -405,6 +416,7 @@ public com.google.rpc.LocalizedMessage build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.LocalizedMessage buildPartial() {
       com.google.rpc.LocalizedMessage result = new com.google.rpc.LocalizedMessage(this);
       result.locale_ = locale_;
@@ -413,32 +425,39 @@ public com.google.rpc.LocalizedMessage buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.LocalizedMessage) {
         return mergeFrom((com.google.rpc.LocalizedMessage)other);
@@ -463,10 +482,12 @@ public Builder mergeFrom(com.google.rpc.LocalizedMessage other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -672,11 +693,13 @@ public Builder setMessageBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -698,6 +721,7 @@ public static com.google.rpc.LocalizedMessage getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<LocalizedMessage>
       PARSER = new com.google.protobuf.AbstractParser<LocalizedMessage>() {
+    @java.lang.Override
     public LocalizedMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -715,6 +739,7 @@ public com.google.protobuf.Parser<LocalizedMessage> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.LocalizedMessage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
index d0a01f377..64b1e8bc2 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
@@ -50,13 +50,6 @@ private PreconditionFailure(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               violations_ = new java.util.ArrayList<com.google.rpc.PreconditionFailure.Violation>();
@@ -66,6 +59,13 @@ private PreconditionFailure(
                 input.readMessage(com.google.rpc.PreconditionFailure.Violation.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -86,6 +86,7 @@ private PreconditionFailure(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_fieldAccessorTable
@@ -209,13 +210,6 @@ private Violation(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -234,6 +228,13 @@ private Violation(
               description_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -251,6 +252,7 @@ private Violation(
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_Violation_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_Violation_fieldAccessorTable
@@ -397,6 +399,7 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -406,6 +409,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getTypeBytes().isEmpty()) {
@@ -420,6 +424,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -548,6 +553,7 @@ public static com.google.rpc.PreconditionFailure.Violation parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -555,6 +561,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.rpc.PreconditionFailure.Violation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -582,6 +589,7 @@ public static final class Builder extends
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_Violation_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_Violation_fieldAccessorTable
@@ -604,6 +612,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = "";
@@ -615,15 +624,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_Violation_descriptor;
       }
 
+      @java.lang.Override
       public com.google.rpc.PreconditionFailure.Violation getDefaultInstanceForType() {
         return com.google.rpc.PreconditionFailure.Violation.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.rpc.PreconditionFailure.Violation build() {
         com.google.rpc.PreconditionFailure.Violation result = buildPartial();
         if (!result.isInitialized()) {
@@ -632,6 +644,7 @@ public com.google.rpc.PreconditionFailure.Violation build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.rpc.PreconditionFailure.Violation buildPartial() {
         com.google.rpc.PreconditionFailure.Violation result = new com.google.rpc.PreconditionFailure.Violation(this);
         result.type_ = type_;
@@ -641,32 +654,39 @@ public com.google.rpc.PreconditionFailure.Violation buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.PreconditionFailure.Violation) {
           return mergeFrom((com.google.rpc.PreconditionFailure.Violation)other);
@@ -695,10 +715,12 @@ public Builder mergeFrom(com.google.rpc.PreconditionFailure.Violation other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1013,11 +1035,13 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1039,6 +1063,7 @@ public static com.google.rpc.PreconditionFailure.Violation getDefaultInstance()
 
     private static final com.google.protobuf.Parser<Violation>
         PARSER = new com.google.protobuf.AbstractParser<Violation>() {
+      @java.lang.Override
       public Violation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1056,6 +1081,7 @@ public com.google.protobuf.Parser<Violation> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.rpc.PreconditionFailure.Violation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1118,6 +1144,7 @@ public com.google.rpc.PreconditionFailure.ViolationOrBuilder getViolationsOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1127,6 +1154,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < violations_.size(); i++) {
@@ -1135,6 +1163,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1252,6 +1281,7 @@ public static com.google.rpc.PreconditionFailure parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1259,6 +1289,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.PreconditionFailure prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1289,6 +1320,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_fieldAccessorTable
@@ -1312,6 +1344,7 @@ private void maybeForceBuilderInitialization() {
         getViolationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (violationsBuilder_ == null) {
@@ -1323,15 +1356,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_PreconditionFailure_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.PreconditionFailure getDefaultInstanceForType() {
       return com.google.rpc.PreconditionFailure.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.PreconditionFailure build() {
       com.google.rpc.PreconditionFailure result = buildPartial();
       if (!result.isInitialized()) {
@@ -1340,6 +1376,7 @@ public com.google.rpc.PreconditionFailure build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.PreconditionFailure buildPartial() {
       com.google.rpc.PreconditionFailure result = new com.google.rpc.PreconditionFailure(this);
       int from_bitField0_ = bitField0_;
@@ -1356,32 +1393,39 @@ public com.google.rpc.PreconditionFailure buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.PreconditionFailure) {
         return mergeFrom((com.google.rpc.PreconditionFailure)other);
@@ -1424,10 +1468,12 @@ public Builder mergeFrom(com.google.rpc.PreconditionFailure other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1758,11 +1804,13 @@ public com.google.rpc.PreconditionFailure.Violation.Builder addViolationsBuilder
       }
       return violationsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1784,6 +1832,7 @@ public static com.google.rpc.PreconditionFailure getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<PreconditionFailure>
       PARSER = new com.google.protobuf.AbstractParser<PreconditionFailure>() {
+    @java.lang.Override
     public PreconditionFailure parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1801,6 +1850,7 @@ public com.google.protobuf.Parser<PreconditionFailure> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.PreconditionFailure getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
index 5a38a198f..68e6515ad 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
@@ -55,13 +55,6 @@ private QuotaFailure(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               violations_ = new java.util.ArrayList<com.google.rpc.QuotaFailure.Violation>();
@@ -71,6 +64,13 @@ private QuotaFailure(
                 input.readMessage(com.google.rpc.QuotaFailure.Violation.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,6 +91,7 @@ private QuotaFailure(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_fieldAccessorTable
@@ -198,13 +199,6 @@ private Violation(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -217,6 +211,13 @@ private Violation(
               description_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -234,6 +235,7 @@ private Violation(
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_Violation_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_Violation_fieldAccessorTable
@@ -340,6 +342,7 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -349,6 +352,7 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getSubjectBytes().isEmpty()) {
@@ -360,6 +364,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -481,6 +486,7 @@ public static com.google.rpc.QuotaFailure.Violation parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -488,6 +494,7 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.rpc.QuotaFailure.Violation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -516,6 +523,7 @@ public static final class Builder extends
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_Violation_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_Violation_fieldAccessorTable
@@ -538,6 +546,7 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         subject_ = "";
@@ -547,15 +556,18 @@ public Builder clear() {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_Violation_descriptor;
       }
 
+      @java.lang.Override
       public com.google.rpc.QuotaFailure.Violation getDefaultInstanceForType() {
         return com.google.rpc.QuotaFailure.Violation.getDefaultInstance();
       }
 
+      @java.lang.Override
       public com.google.rpc.QuotaFailure.Violation build() {
         com.google.rpc.QuotaFailure.Violation result = buildPartial();
         if (!result.isInitialized()) {
@@ -564,6 +576,7 @@ public com.google.rpc.QuotaFailure.Violation build() {
         return result;
       }
 
+      @java.lang.Override
       public com.google.rpc.QuotaFailure.Violation buildPartial() {
         com.google.rpc.QuotaFailure.Violation result = new com.google.rpc.QuotaFailure.Violation(this);
         result.subject_ = subject_;
@@ -572,32 +585,39 @@ public com.google.rpc.QuotaFailure.Violation buildPartial() {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.QuotaFailure.Violation) {
           return mergeFrom((com.google.rpc.QuotaFailure.Violation)other);
@@ -622,10 +642,12 @@ public Builder mergeFrom(com.google.rpc.QuotaFailure.Violation other) {
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -856,11 +878,13 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -882,6 +906,7 @@ public static com.google.rpc.QuotaFailure.Violation getDefaultInstance() {
 
     private static final com.google.protobuf.Parser<Violation>
         PARSER = new com.google.protobuf.AbstractParser<Violation>() {
+      @java.lang.Override
       public Violation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -899,6 +924,7 @@ public com.google.protobuf.Parser<Violation> getParserForType() {
       return PARSER;
     }
 
+    @java.lang.Override
     public com.google.rpc.QuotaFailure.Violation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -961,6 +987,7 @@ public com.google.rpc.QuotaFailure.ViolationOrBuilder getViolationsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -970,6 +997,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < violations_.size(); i++) {
@@ -978,6 +1006,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1095,6 +1124,7 @@ public static com.google.rpc.QuotaFailure parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1102,6 +1132,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.QuotaFailure prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1137,6 +1168,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_fieldAccessorTable
@@ -1160,6 +1192,7 @@ private void maybeForceBuilderInitialization() {
         getViolationsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (violationsBuilder_ == null) {
@@ -1171,15 +1204,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.QuotaFailure getDefaultInstanceForType() {
       return com.google.rpc.QuotaFailure.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.QuotaFailure build() {
       com.google.rpc.QuotaFailure result = buildPartial();
       if (!result.isInitialized()) {
@@ -1188,6 +1224,7 @@ public com.google.rpc.QuotaFailure build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.QuotaFailure buildPartial() {
       com.google.rpc.QuotaFailure result = new com.google.rpc.QuotaFailure(this);
       int from_bitField0_ = bitField0_;
@@ -1204,32 +1241,39 @@ public com.google.rpc.QuotaFailure buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.QuotaFailure) {
         return mergeFrom((com.google.rpc.QuotaFailure)other);
@@ -1272,10 +1316,12 @@ public Builder mergeFrom(com.google.rpc.QuotaFailure other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1606,11 +1652,13 @@ public com.google.rpc.QuotaFailure.Violation.Builder addViolationsBuilder(
       }
       return violationsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1632,6 +1680,7 @@ public static com.google.rpc.QuotaFailure getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<QuotaFailure>
       PARSER = new com.google.protobuf.AbstractParser<QuotaFailure>() {
+    @java.lang.Override
     public QuotaFailure parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1649,6 +1698,7 @@ public com.google.protobuf.Parser<QuotaFailure> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.QuotaFailure getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
index 0f05b2c61..b76620ce0 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
@@ -49,13 +49,6 @@ private RequestInfo(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,6 +61,13 @@ private RequestInfo(
             servingData_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,6 +85,7 @@ private RequestInfo(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_fieldAccessorTable
@@ -181,6 +182,7 @@ public java.lang.String getServingData() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,6 +192,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getRequestIdBytes().isEmpty()) {
@@ -201,6 +204,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -322,6 +326,7 @@ public static com.google.rpc.RequestInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,6 +334,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.RequestInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,6 +363,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_fieldAccessorTable
@@ -379,6 +386,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       requestId_ = "";
@@ -388,15 +396,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.RequestInfo getDefaultInstanceForType() {
       return com.google.rpc.RequestInfo.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.RequestInfo build() {
       com.google.rpc.RequestInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -405,6 +416,7 @@ public com.google.rpc.RequestInfo build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.RequestInfo buildPartial() {
       com.google.rpc.RequestInfo result = new com.google.rpc.RequestInfo(this);
       result.requestId_ = requestId_;
@@ -413,32 +425,39 @@ public com.google.rpc.RequestInfo buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.RequestInfo) {
         return mergeFrom((com.google.rpc.RequestInfo)other);
@@ -463,10 +482,12 @@ public Builder mergeFrom(com.google.rpc.RequestInfo other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -672,11 +693,13 @@ public Builder setServingDataBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -698,6 +721,7 @@ public static com.google.rpc.RequestInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<RequestInfo>
       PARSER = new com.google.protobuf.AbstractParser<RequestInfo>() {
+    @java.lang.Override
     public RequestInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -715,6 +739,7 @@ public com.google.protobuf.Parser<RequestInfo> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.RequestInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
index fc47d22e8..1ff2d2621 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
@@ -50,13 +50,6 @@ private ResourceInfo(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -81,6 +74,13 @@ private ResourceInfo(
             description_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,6 +98,7 @@ private ResourceInfo(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_fieldAccessorTable
@@ -290,6 +291,7 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -299,6 +301,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getResourceTypeBytes().isEmpty()) {
@@ -316,6 +319,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,6 +455,7 @@ public static com.google.rpc.ResourceInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -458,6 +463,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.ResourceInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,6 +491,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_fieldAccessorTable
@@ -507,6 +514,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       resourceType_ = "";
@@ -520,15 +528,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.ResourceInfo getDefaultInstanceForType() {
       return com.google.rpc.ResourceInfo.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.ResourceInfo build() {
       com.google.rpc.ResourceInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -537,6 +548,7 @@ public com.google.rpc.ResourceInfo build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.ResourceInfo buildPartial() {
       com.google.rpc.ResourceInfo result = new com.google.rpc.ResourceInfo(this);
       result.resourceType_ = resourceType_;
@@ -547,32 +559,39 @@ public com.google.rpc.ResourceInfo buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.ResourceInfo) {
         return mergeFrom((com.google.rpc.ResourceInfo)other);
@@ -605,10 +624,12 @@ public Builder mergeFrom(com.google.rpc.ResourceInfo other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1022,11 +1043,13 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1048,6 +1071,7 @@ public static com.google.rpc.ResourceInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<ResourceInfo>
       PARSER = new com.google.protobuf.AbstractParser<ResourceInfo>() {
+    @java.lang.Override
     public ResourceInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1065,6 +1089,7 @@ public com.google.protobuf.Parser<ResourceInfo> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.ResourceInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
index 098fec3bd..dded7306f 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
@@ -56,13 +56,6 @@ private RetryInfo(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (retryDelay_ != null) {
@@ -76,6 +69,13 @@ private RetryInfo(
 
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,6 +93,7 @@ private RetryInfo(
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_fieldAccessorTable
@@ -134,6 +135,7 @@ public com.google.protobuf.DurationOrBuilder getRetryDelayOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,6 +145,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (retryDelay_ != null) {
@@ -151,6 +154,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -271,6 +275,7 @@ public static com.google.rpc.RetryInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -278,6 +283,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.RetryInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -315,6 +321,7 @@ public static final class Builder extends
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_fieldAccessorTable
@@ -337,6 +344,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (retryDelayBuilder_ == null) {
@@ -348,15 +356,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.RetryInfo getDefaultInstanceForType() {
       return com.google.rpc.RetryInfo.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.RetryInfo build() {
       com.google.rpc.RetryInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -365,6 +376,7 @@ public com.google.rpc.RetryInfo build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.RetryInfo buildPartial() {
       com.google.rpc.RetryInfo result = new com.google.rpc.RetryInfo(this);
       if (retryDelayBuilder_ == null) {
@@ -376,32 +388,39 @@ public com.google.rpc.RetryInfo buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.RetryInfo) {
         return mergeFrom((com.google.rpc.RetryInfo)other);
@@ -421,10 +440,12 @@ public Builder mergeFrom(com.google.rpc.RetryInfo other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -595,11 +616,13 @@ public com.google.protobuf.DurationOrBuilder getRetryDelayOrBuilder() {
       }
       return retryDelayBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -621,6 +644,7 @@ public static com.google.rpc.RetryInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<RetryInfo>
       PARSER = new com.google.protobuf.AbstractParser<RetryInfo>() {
+    @java.lang.Override
     public RetryInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -638,6 +662,7 @@ public com.google.protobuf.Parser<RetryInfo> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.RetryInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Status.java b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
index e48e5332a..028761801 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
@@ -87,13 +87,6 @@ private Status(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             code_ = input.readInt32();
@@ -114,6 +107,13 @@ private Status(
                 input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -134,6 +134,7 @@ private Status(
     return com.google.rpc.StatusProto.internal_static_google_rpc_Status_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.rpc.StatusProto.internal_static_google_rpc_Status_fieldAccessorTable
@@ -262,6 +263,7 @@ public com.google.protobuf.AnyOrBuilder getDetailsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -271,6 +273,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (code_ != 0) {
@@ -285,6 +288,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -417,6 +421,7 @@ public static com.google.rpc.Status parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -424,6 +429,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.rpc.Status prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -489,6 +495,7 @@ public static final class Builder extends
       return com.google.rpc.StatusProto.internal_static_google_rpc_Status_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.rpc.StatusProto.internal_static_google_rpc_Status_fieldAccessorTable
@@ -512,6 +519,7 @@ private void maybeForceBuilderInitialization() {
         getDetailsFieldBuilder();
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -527,15 +535,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.rpc.StatusProto.internal_static_google_rpc_Status_descriptor;
     }
 
+    @java.lang.Override
     public com.google.rpc.Status getDefaultInstanceForType() {
       return com.google.rpc.Status.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.rpc.Status build() {
       com.google.rpc.Status result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,6 +555,7 @@ public com.google.rpc.Status build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.rpc.Status buildPartial() {
       com.google.rpc.Status result = new com.google.rpc.Status(this);
       int from_bitField0_ = bitField0_;
@@ -564,32 +576,39 @@ public com.google.rpc.Status buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.Status) {
         return mergeFrom((com.google.rpc.Status)other);
@@ -639,10 +658,12 @@ public Builder mergeFrom(com.google.rpc.Status other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1128,11 +1149,13 @@ public com.google.protobuf.Any.Builder addDetailsBuilder(
       }
       return detailsBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1154,6 +1177,7 @@ public static com.google.rpc.Status getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Status>
       PARSER = new com.google.protobuf.AbstractParser<Status>() {
+    @java.lang.Override
     public Status parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1171,6 +1195,7 @@ public com.google.protobuf.Parser<Status> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.rpc.Status getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/type/Color.java b/generated/java/proto-google-common-protos/src/main/java/com/google/type/Color.java
index dc35862d7..d70c4ee6c 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/type/Color.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/type/Color.java
@@ -147,13 +147,6 @@ private Color(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 13: {
 
             red_ = input.readFloat();
@@ -182,6 +175,13 @@ private Color(
 
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -199,6 +199,7 @@ private Color(
     return com.google.type.ColorProto.internal_static_google_type_Color_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.type.ColorProto.internal_static_google_type_Color_fieldAccessorTable
@@ -303,6 +304,7 @@ public com.google.protobuf.FloatValueOrBuilder getAlphaOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -312,6 +314,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (red_ != 0F) {
@@ -329,6 +332,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -482,6 +486,7 @@ public static com.google.type.Color parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -489,6 +494,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.type.Color prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -614,6 +620,7 @@ public static final class Builder extends
       return com.google.type.ColorProto.internal_static_google_type_Color_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.type.ColorProto.internal_static_google_type_Color_fieldAccessorTable
@@ -636,6 +643,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       red_ = 0F;
@@ -653,15 +661,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.type.ColorProto.internal_static_google_type_Color_descriptor;
     }
 
+    @java.lang.Override
     public com.google.type.Color getDefaultInstanceForType() {
       return com.google.type.Color.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.type.Color build() {
       com.google.type.Color result = buildPartial();
       if (!result.isInitialized()) {
@@ -670,6 +681,7 @@ public com.google.type.Color build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.type.Color buildPartial() {
       com.google.type.Color result = new com.google.type.Color(this);
       result.red_ = red_;
@@ -684,32 +696,39 @@ public com.google.type.Color buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Color) {
         return mergeFrom((com.google.type.Color)other);
@@ -738,10 +757,12 @@ public Builder mergeFrom(com.google.type.Color other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1098,11 +1119,13 @@ public com.google.protobuf.FloatValueOrBuilder getAlphaOrBuilder() {
       }
       return alphaBuilder_;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1124,6 +1147,7 @@ public static com.google.type.Color getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Color>
       PARSER = new com.google.protobuf.AbstractParser<Color>() {
+    @java.lang.Override
     public Color parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1141,6 +1165,7 @@ public com.google.protobuf.Parser<Color> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.type.Color getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/type/Date.java b/generated/java/proto-google-common-protos/src/main/java/com/google/type/Date.java
index 10835b15e..93fdcb25b 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/type/Date.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/type/Date.java
@@ -55,13 +55,6 @@ private Date(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             year_ = input.readInt32();
@@ -77,6 +70,13 @@ private Date(
             day_ = input.readInt32();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,6 +94,7 @@ private Date(
     return com.google.type.DateProto.internal_static_google_type_Date_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.type.DateProto.internal_static_google_type_Date_fieldAccessorTable
@@ -143,6 +144,7 @@ public int getDay() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -152,6 +154,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (year_ != 0) {
@@ -166,6 +169,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -297,6 +301,7 @@ public static com.google.type.Date parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -304,6 +309,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.type.Date prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -337,6 +343,7 @@ public static final class Builder extends
       return com.google.type.DateProto.internal_static_google_type_Date_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.type.DateProto.internal_static_google_type_Date_fieldAccessorTable
@@ -359,6 +366,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       year_ = 0;
@@ -370,15 +378,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.type.DateProto.internal_static_google_type_Date_descriptor;
     }
 
+    @java.lang.Override
     public com.google.type.Date getDefaultInstanceForType() {
       return com.google.type.Date.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.type.Date build() {
       com.google.type.Date result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,6 +398,7 @@ public com.google.type.Date build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.type.Date buildPartial() {
       com.google.type.Date result = new com.google.type.Date(this);
       result.year_ = year_;
@@ -396,32 +408,39 @@ public com.google.type.Date buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Date) {
         return mergeFrom((com.google.type.Date)other);
@@ -447,10 +466,12 @@ public Builder mergeFrom(com.google.type.Date other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -588,11 +609,13 @@ public Builder clearDay() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -614,6 +637,7 @@ public static com.google.type.Date getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Date>
       PARSER = new com.google.protobuf.AbstractParser<Date>() {
+    @java.lang.Override
     public Date parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -631,6 +655,7 @@ public com.google.protobuf.Parser<Date> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.type.Date getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/type/LatLng.java b/generated/java/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
index 469b25fea..36334cb14 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
@@ -82,13 +82,6 @@ private LatLng(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 9: {
 
             latitude_ = input.readDouble();
@@ -99,6 +92,13 @@ private LatLng(
             longitude_ = input.readDouble();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,6 +116,7 @@ private LatLng(
     return com.google.type.LatLngProto.internal_static_google_type_LatLng_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.type.LatLngProto.internal_static_google_type_LatLng_fieldAccessorTable
@@ -150,6 +151,7 @@ public double getLongitude() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,6 +161,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latitude_ != 0D) {
@@ -170,6 +173,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,6 +303,7 @@ public static com.google.type.LatLng parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,6 +311,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.type.LatLng prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,6 +373,7 @@ public static final class Builder extends
       return com.google.type.LatLngProto.internal_static_google_type_LatLng_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.type.LatLngProto.internal_static_google_type_LatLng_fieldAccessorTable
@@ -389,6 +396,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       latitude_ = 0D;
@@ -398,15 +406,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.type.LatLngProto.internal_static_google_type_LatLng_descriptor;
     }
 
+    @java.lang.Override
     public com.google.type.LatLng getDefaultInstanceForType() {
       return com.google.type.LatLng.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.type.LatLng build() {
       com.google.type.LatLng result = buildPartial();
       if (!result.isInitialized()) {
@@ -415,6 +426,7 @@ public com.google.type.LatLng build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.type.LatLng buildPartial() {
       com.google.type.LatLng result = new com.google.type.LatLng(this);
       result.latitude_ = latitude_;
@@ -423,32 +435,39 @@ public com.google.type.LatLng buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.LatLng) {
         return mergeFrom((com.google.type.LatLng)other);
@@ -471,10 +490,12 @@ public Builder mergeFrom(com.google.type.LatLng other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -568,11 +589,13 @@ public Builder clearLongitude() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -594,6 +617,7 @@ public static com.google.type.LatLng getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<LatLng>
       PARSER = new com.google.protobuf.AbstractParser<LatLng>() {
+    @java.lang.Override
     public LatLng parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -611,6 +635,7 @@ public com.google.protobuf.Parser<LatLng> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.type.LatLng getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/type/Money.java b/generated/java/proto-google-common-protos/src/main/java/com/google/type/Money.java
index cc017d6cc..9073f599d 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/type/Money.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/type/Money.java
@@ -49,13 +49,6 @@ private Money(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -72,6 +65,13 @@ private Money(
             nanos_ = input.readInt32();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,6 +89,7 @@ private Money(
     return com.google.type.MoneyProto.internal_static_google_type_Money_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.type.MoneyProto.internal_static_google_type_Money_fieldAccessorTable
@@ -171,6 +172,7 @@ public int getNanos() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -180,6 +182,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCurrencyCodeBytes().isEmpty()) {
@@ -194,6 +197,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -325,6 +329,7 @@ public static com.google.type.Money parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,6 +337,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.type.Money prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,6 +365,7 @@ public static final class Builder extends
       return com.google.type.MoneyProto.internal_static_google_type_Money_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.type.MoneyProto.internal_static_google_type_Money_fieldAccessorTable
@@ -381,6 +388,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       currencyCode_ = "";
@@ -392,15 +400,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.type.MoneyProto.internal_static_google_type_Money_descriptor;
     }
 
+    @java.lang.Override
     public com.google.type.Money getDefaultInstanceForType() {
       return com.google.type.Money.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.type.Money build() {
       com.google.type.Money result = buildPartial();
       if (!result.isInitialized()) {
@@ -409,6 +420,7 @@ public com.google.type.Money build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.type.Money buildPartial() {
       com.google.type.Money result = new com.google.type.Money(this);
       result.currencyCode_ = currencyCode_;
@@ -418,32 +430,39 @@ public com.google.type.Money buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Money) {
         return mergeFrom((com.google.type.Money)other);
@@ -470,10 +489,12 @@ public Builder mergeFrom(com.google.type.Money other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -674,11 +695,13 @@ public Builder clearNanos() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -700,6 +723,7 @@ public static com.google.type.Money getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<Money>
       PARSER = new com.google.protobuf.AbstractParser<Money>() {
+    @java.lang.Override
     public Money parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -717,6 +741,7 @@ public com.google.protobuf.Parser<Money> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.type.Money getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java b/generated/java/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
index 407327d99..862fbaf53 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
@@ -70,13 +70,6 @@ private PostalAddress(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             revision_ = input.readInt32();
@@ -148,6 +141,13 @@ private PostalAddress(
             organization_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -171,6 +171,7 @@ private PostalAddress(
     return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_fieldAccessorTable
@@ -760,6 +761,7 @@ public java.lang.String getOrganization() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -769,6 +771,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (revision_ != 0) {
@@ -807,6 +810,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1006,6 +1010,7 @@ public static com.google.type.PostalAddress parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1013,6 +1018,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.type.PostalAddress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1053,6 +1059,7 @@ public static final class Builder extends
       return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_fieldAccessorTable
@@ -1075,6 +1082,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       revision_ = 0;
@@ -1102,15 +1110,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_descriptor;
     }
 
+    @java.lang.Override
     public com.google.type.PostalAddress getDefaultInstanceForType() {
       return com.google.type.PostalAddress.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.type.PostalAddress build() {
       com.google.type.PostalAddress result = buildPartial();
       if (!result.isInitialized()) {
@@ -1119,6 +1130,7 @@ public com.google.type.PostalAddress build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.type.PostalAddress buildPartial() {
       com.google.type.PostalAddress result = new com.google.type.PostalAddress(this);
       int from_bitField0_ = bitField0_;
@@ -1147,32 +1159,39 @@ public com.google.type.PostalAddress buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.PostalAddress) {
         return mergeFrom((com.google.type.PostalAddress)other);
@@ -1244,10 +1263,12 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2609,11 +2630,13 @@ public Builder setOrganizationBytes(
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2635,6 +2658,7 @@ public static com.google.type.PostalAddress getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<PostalAddress>
       PARSER = new com.google.protobuf.AbstractParser<PostalAddress>() {
+    @java.lang.Override
     public PostalAddress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2652,6 +2676,7 @@ public com.google.protobuf.Parser<PostalAddress> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.type.PostalAddress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java b/generated/java/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
index 65d1ab256..47e5842b0 100644
--- a/generated/java/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
+++ b/generated/java/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
@@ -52,13 +52,6 @@ private TimeOfDay(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             hours_ = input.readInt32();
@@ -79,6 +72,13 @@ private TimeOfDay(
             nanos_ = input.readInt32();
             break;
           }
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,6 +96,7 @@ private TimeOfDay(
     return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_fieldAccessorTable
@@ -158,6 +159,7 @@ public int getNanos() {
   }
 
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,6 +169,7 @@ public final boolean isInitialized() {
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (hours_ != 0) {
@@ -184,6 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,6 +327,7 @@ public static com.google.type.TimeOfDay parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -330,6 +335,7 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.type.TimeOfDay prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,6 +365,7 @@ public static final class Builder extends
       return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_fieldAccessorTable
@@ -381,6 +388,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       hours_ = 0;
@@ -394,15 +402,18 @@ public Builder clear() {
       return this;
     }
 
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_descriptor;
     }
 
+    @java.lang.Override
     public com.google.type.TimeOfDay getDefaultInstanceForType() {
       return com.google.type.TimeOfDay.getDefaultInstance();
     }
 
+    @java.lang.Override
     public com.google.type.TimeOfDay build() {
       com.google.type.TimeOfDay result = buildPartial();
       if (!result.isInitialized()) {
@@ -411,6 +422,7 @@ public com.google.type.TimeOfDay build() {
       return result;
     }
 
+    @java.lang.Override
     public com.google.type.TimeOfDay buildPartial() {
       com.google.type.TimeOfDay result = new com.google.type.TimeOfDay(this);
       result.hours_ = hours_;
@@ -421,32 +433,39 @@ public com.google.type.TimeOfDay buildPartial() {
       return result;
     }
 
+    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
+    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.TimeOfDay) {
         return mergeFrom((com.google.type.TimeOfDay)other);
@@ -475,10 +494,12 @@ public Builder mergeFrom(com.google.type.TimeOfDay other) {
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -654,11 +675,13 @@ public Builder clearNanos() {
       onChanged();
       return this;
     }
+    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -680,6 +703,7 @@ public static com.google.type.TimeOfDay getDefaultInstance() {
 
   private static final com.google.protobuf.Parser<TimeOfDay>
       PARSER = new com.google.protobuf.AbstractParser<TimeOfDay>() {
+    @java.lang.Override
     public TimeOfDay parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -697,6 +721,7 @@ public com.google.protobuf.Parser<TimeOfDay> getParserForType() {
     return PARSER;
   }
 
+  @java.lang.Override
   public com.google.type.TimeOfDay getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/annotations.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/annotations.proto
index 85c361b47..aaf77c565 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/annotations.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/annotations.proto
@@ -17,6 +17,10 @@ syntax = "proto3";
 package google.api;
 
 import "google/api/http.proto";
+import "google/api/metadata.proto";
+import "google/api/resources.proto";
+import "google/api/retry.proto";
+import "google/api/signature.proto";
 import "google/protobuf/descriptor.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
@@ -25,7 +29,82 @@ option java_outer_classname = "AnnotationsProto";
 option java_package = "com.google.api";
 option objc_class_prefix = "GAPI";
 
+
+// A struct of required information an API client library.
+extend google.protobuf.FileOptions {
+  // Packaging information.
+  // See `google/api/metadata.proto`.
+  Metadata metadata = 1048;
+}
+
+
+// Information for connecting to the service.
+extend google.protobuf.ServiceOptions {
+  // Required. The hostname for this service (e.g. "foo.googleapis.com").
+  // This should be specified with no prefix.
+  string default_host = 1049;
+
+  // Required. OAuth information for the client.
+  // The "scopes" key is a repeated string; see `google/api/metadata.proto`.
+  OAuth oauth = 1050;
+}
+
+
+extend google.protobuf.FieldOptions {
+  // A representation of the resource.
+  // This is generally intended to be attached to the "name" field.
+  // See `google/api/resources.proto`.
+  Resource resource = 1053;
+
+  // A representation of a set of resources, any of which may be
+  // represented.
+  // This is generally intended to be attached to the "name" field
+  // and is mutually exclusive with `resource`.
+  // See `google/api/resources.proto`.
+  ResourceSet resource_set = 1054;
+
+  // The fully qualified message name of the type that this references.
+  // Marks this as a field referring to a resource in another message.
+  // See `google/api/resources.proto`.
+  string resource_type = 1055;
+
+  // A designation of a specific field as required in requests.
+  // Complements `method_signature` in the method options;
+  // see `google/api/signature.proto` for more details.
+  bool required = 1052;
+}
+
+
 extend google.protobuf.MethodOptions {
-  // See `HttpRule`.
+  // Retry information for the applicable method.
+  // See `google/api/retry.proto`.
+  Retry retry = 1056;
+
+  // The parameter lists defined for this method.
+  // See `google/api/signature.proto`.
+  MethodSignature method_signature = 1051;
+
+  // The HTTP bindings for this method.
+  // See `google/api/http.proto`.
   HttpRule http = 72295728;
 }
+
+
+// -- These are not annotations, but placing them here solves for a common
+// -- potential import issue.
+
+// A message representing a Project.
+// Useful to be able to declare a project as a referent for another field.
+// (See `resources.proto` in this directory.)
+message Project {
+  string name = 1 [(google.api.resource).path = "projects/*"];
+}
+
+
+// A message representing an Organization.
+// Useful to be able to declare an organization as a referent for another
+// field.
+// (See `resources.proto` in this directory.)
+message Organization {
+  string name = 1 [(google.api.resource).path = "organizations/*"];
+}
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/auth.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/auth.proto
index cdbc1efe9..db8638351 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/auth.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/auth.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.api;
 
-import "google/api/annotations.proto";
-
 option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig";
 option java_multiple_files = true;
 option java_outer_classname = "AuthProto";
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/billing.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/billing.proto
index a20bd58f7..54c6cca97 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/billing.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/billing.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.api;
 
 import "google/api/annotations.proto";
-import "google/api/metric.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig";
 option java_multiple_files = true;
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/distribution.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/distribution.proto
index 2861e9b6f..f909038be 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/distribution.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/distribution.proto
@@ -17,8 +17,6 @@ syntax = "proto3";
 package google.api;
 
 import "google/api/annotations.proto";
-import "google/protobuf/any.proto";
-import "google/protobuf/timestamp.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/api/distribution;distribution";
 option java_multiple_files = true;
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/experimental/experimental.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/experimental/experimental.proto
deleted file mode 100644
index a839cee57..000000000
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/experimental/experimental.proto
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2018 Google LLC.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/api/annotations.proto";
-import "google/api/experimental/authorization_config.proto";
-
-option go_package = "google.golang.org/genproto/googleapis/api;api";
-option java_multiple_files = true;
-option java_outer_classname = "ExperimentalProto";
-option java_package = "com.google.api";
-option objc_class_prefix = "GAPI";
-
-
-// Experimental service configuration. These configuration options can
-// only be used by whitelisted users.
-message Experimental {
-  // Authorization configuration.
-  AuthorizationConfig authorization = 8;
-}
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/metadata.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/metadata.proto
new file mode 100644
index 000000000..cff1f959e
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/metadata.proto
@@ -0,0 +1,71 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package google.api;
+
+import "google/protobuf/descriptor.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
+option java_multiple_files = true;
+option java_outer_classname = "MetadataProto";
+option java_package = "com.google.api";
+
+
+// Information about the API as a whole. Generally used for packaging
+// and documentation.
+message Metadata {
+  // The name of the product.
+  //
+  // This should be set to the colloquial name of the API, and is used
+  // for things such as determining the package name. If not set, it is
+  // inferred based on the final proto package segment before the version.
+  //
+  // Specify this in appropriate title casing, with space as the word
+  // separator (e.g. "Speech", "BigQuery", "Video Intelligence").
+  //
+  // This value may be used as-is in documentation, and code generators should
+  // normalize it appropriately for idiomatic package, module, etc. names in
+  // their language. However, this value is superseded by the language specific
+  // options introduced for some languages.
+  string product_name = 1;
+
+  // The URI for this product.
+  // This may be used in documentation and package metadata.
+  string product_uri = 2;
+
+  // The name of the client library package, if it differs from the
+  // product name.
+  string package_name = 3;
+
+  // The namespace.
+  //
+  // This should be set to the package namespace, using appropriate title
+  // casing. Translators should normalize it appropriately for package, module,
+  // etc. names in their language.
+  //
+  // If not set, this is inferred from the proto package (all segments
+  // prior to the segment that determines `api_name`).
+  repeated string package_namespace = 4;
+}
+
+
+// Information about OAuth.
+message OAuth {
+  // The set of OAuth scopes needed to be able to successfully call any RPC
+  // on the service. These are generally specified as a URL, for example:
+  // "https://www.googleapis.com/auth/cloud-platform"
+  repeated string scopes = 1;
+}
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/resources.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/resources.proto
new file mode 100644
index 000000000..94b8d25bf
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/resources.proto
@@ -0,0 +1,51 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+syntax = "proto3";
+
+package google.api;
+
+import "google/protobuf/descriptor.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
+option java_multiple_files = true;
+option java_outer_classname = "ResourcesProto";
+option java_package = "com.google.api";
+
+
+// An annotation designating that this field designates a One Platform
+// resource.
+message Resource {
+  // Required. The resource's path. This is usually in a form such as:
+  //   projects/*/things/*
+  string path = 1;
+
+  // The colloquial name of the resource.
+  // If omitted, this is the name of the message.
+  // This is required if the resource is within a ResourceSet (see below).
+  string base_name = 2;
+}
+
+
+// An annotation designating that this field designates a set of One Platform
+// resources.
+message ResourceSet {
+  // The colloquial name of the resource.
+  // If omitted, this is the name of the message.
+  string base_name = 1;
+
+  // The distinct resources that make up the set.
+  repeated Resource resources = 2;
+}
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/experimental/authorization_config.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/retry.proto
similarity index 50%
rename from generated/java/proto-google-common-protos/src/main/proto/google/api/experimental/authorization_config.proto
rename to generated/java/proto-google-common-protos/src/main/proto/google/api/retry.proto
index 21b35af48..10561a089 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/experimental/authorization_config.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/retry.proto
@@ -1,10 +1,10 @@
-// Copyright 2018 Google LLC.
+// Copyright 2018 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//     https://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,25 +16,22 @@ syntax = "proto3";
 
 package google.api;
 
-option go_package = "google.golang.org/genproto/googleapis/api;api";
+import "google/protobuf/descriptor.proto";
+import "google/rpc/code.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
 option java_multiple_files = true;
-option java_outer_classname = "AuthorizationConfigProto";
+option java_outer_classname = "RetryProto";
 option java_package = "com.google.api";
-option objc_class_prefix = "GAPI";
 
 
-// Configuration of authorization.
-//
-// This section determines the authorization provider, if unspecified, then no
-// authorization check will be done.
-//
-// Example:
-//
-//     experimental:
-//       authorization:
-//         provider: firebaserules.googleapis.com
-message AuthorizationConfig {
-  // The name of the authorization provider, such as
-  // firebaserules.googleapis.com.
-  string provider = 1;
+// Information about situations where retrying a request should be
+// handled automatically.
+message Retry {
+  // Designate that the given gRPC error codes should be automatically
+  // retried by clients.
+  //
+  // `INTERNAL` and `UNAVAILABLE` are retried on requests known
+  // to be idempotent (annotated with google.api.http with a `get` key).
+  repeated google.rpc.Code codes = 1;
 }
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/service.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/service.proto
index 87fba7ba6..951c7ac05 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/api/service.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/service.proto
@@ -24,9 +24,7 @@ import "google/api/context.proto";
 import "google/api/control.proto";
 import "google/api/documentation.proto";
 import "google/api/endpoint.proto";
-import "google/api/experimental/experimental.proto";
 import "google/api/http.proto";
-import "google/api/label.proto";
 import "google/api/log.proto";
 import "google/api/logging.proto";
 import "google/api/metric.proto";
@@ -36,7 +34,6 @@ import "google/api/quota.proto";
 import "google/api/source_info.proto";
 import "google/api/system_parameter.proto";
 import "google/api/usage.proto";
-import "google/protobuf/any.proto";
 import "google/protobuf/api.proto";
 import "google/protobuf/type.proto";
 import "google/protobuf/wrappers.proto";
@@ -174,5 +171,5 @@ message Service {
   SourceInfo source_info = 37;
 
   // Experimental configuration.
-  Experimental experimental = 101;
+  reserved 101;
 }
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/api/signature.proto b/generated/java/proto-google-common-protos/src/main/proto/google/api/signature.proto
new file mode 100644
index 000000000..67efaf2ce
--- /dev/null
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/api/signature.proto
@@ -0,0 +1,39 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package google.api;
+
+import "google/protobuf/descriptor.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
+option java_multiple_files = true;
+option java_outer_classname = "SignatureProto";
+option java_package = "com.google.api";
+
+
+// A definition of a client library method signature.
+message MethodSignature {
+  // The list of fields which are considered to be part of the signature,
+  // in the order in which they are expected to appear.
+  repeated string fields = 1;
+
+  // The name of the function, if it should intentionally differ from the
+  // name of the RPC.
+  string function_name = 2;
+
+  // Additional signatures also applicable to the method.
+  repeated MethodSignature additional_signatures = 3;
+}
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto b/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto
index 4bca50823..8b9301f11 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2017 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto b/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto
index d366e0778..41351c676 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2017 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/generated/java/proto-google-common-protos/src/main/proto/google/longrunning/operations.proto b/generated/java/proto-google-common-protos/src/main/proto/google/longrunning/operations.proto
index 76fef29c3..13dffffa2 100644
--- a/generated/java/proto-google-common-protos/src/main/proto/google/longrunning/operations.proto
+++ b/generated/java/proto-google-common-protos/src/main/proto/google/longrunning/operations.proto
@@ -18,6 +18,7 @@ package google.longrunning;
 
 import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
+import "google/protobuf/descriptor.proto";
 import "google/protobuf/empty.proto";
 import "google/rpc/status.proto";
 
@@ -158,3 +159,23 @@ message DeleteOperationRequest {
   string name = 1;
 }
 
+// The protocol buffer types used to indirectly support this method.
+message OperationTypes {
+  // Required. The message name of the primary return type for this
+  // long-running operation.
+  // This type will be used to deserialize the LRO's response.
+  //
+  // If the response is in a different package from the rpc, a fully-qualified
+  // message name must be used (e.g. "google.protobuf.Empty").
+  string response = 1;
+
+  // The metadata message name for this long-running operation.
+  string metadata = 2;
+}
+
+extend google.protobuf.MethodOptions {
+  // The types that are returned from long-running operations.
+  // Required for methods that return google.longrunning.Operation; invalid
+  // otherwise.
+  OperationTypes operation_types = 1049;
+}