From 7fc5d16d1c81318dddc75983b4953f5582bd31f1 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Thu, 25 May 2023 15:52:21 -0400
Subject: [PATCH] Revert "chore: [common-protos] upgrading Protobuf to 23.1 and
 gRPC to 1.55.0 in code generation (#1705)"

This reverts commit 64a27141b68d935e7cbb8157c8dbbf3e8a71c423.
---
 .../clirr-ignored-differences.xml             |  30 --
 .../src/main/java/com/google/api/Advice.java  |  38 ++
 .../java/com/google/api/AuthProvider.java     | 142 ++---
 .../com/google/api/AuthProviderOrBuilder.java |  25 -
 .../java/com/google/api/AuthRequirement.java  |  73 +--
 .../google/api/AuthRequirementOrBuilder.java  |  10 -
 .../java/com/google/api/Authentication.java   |  65 ++-
 .../google/api/AuthenticationOrBuilder.java   |   5 -
 .../com/google/api/AuthenticationRule.java    |  49 +-
 .../api/AuthenticationRuleOrBuilder.java      |   2 -
 .../src/main/java/com/google/api/Backend.java |  61 ++-
 .../java/com/google/api/BackendOrBuilder.java |   5 -
 .../main/java/com/google/api/BackendRule.java | 142 ++---
 .../com/google/api/BackendRuleOrBuilder.java  |  24 +-
 .../src/main/java/com/google/api/Billing.java | 125 ++++-
 .../com/google/api/ClientLibrarySettings.java |  38 ++
 .../main/java/com/google/api/ClientProto.java |  15 -
 .../google/api/CommonLanguageSettings.java    |  38 ++
 .../java/com/google/api/ConfigChange.java     |  40 +-
 .../src/main/java/com/google/api/Context.java |  77 ++-
 .../java/com/google/api/ContextOrBuilder.java |   5 -
 .../main/java/com/google/api/ContextRule.java | 197 +++----
 .../com/google/api/ContextRuleOrBuilder.java  |   2 -
 .../src/main/java/com/google/api/Control.java |  42 +-
 .../main/java/com/google/api/CppSettings.java |  38 ++
 .../com/google/api/CustomHttpPattern.java     |  38 ++
 .../java/com/google/api/Distribution.java     | 450 ++++++++++------
 .../com/google/api/DistributionOrBuilder.java |   9 -
 .../java/com/google/api/Documentation.java    |  71 +--
 .../google/api/DocumentationOrBuilder.java    |   5 -
 .../com/google/api/DocumentationRule.java     |  38 ++
 .../java/com/google/api/DotnetSettings.java   | 153 +++---
 .../main/java/com/google/api/Endpoint.java    | 109 ++--
 .../com/google/api/EndpointOrBuilder.java     |   8 -
 .../main/java/com/google/api/ErrorReason.java | 142 -----
 .../java/com/google/api/FieldBehavior.java    |   1 -
 .../com/google/api/FieldBehaviorProto.java    |   2 -
 .../main/java/com/google/api/GoSettings.java  |  38 ++
 .../src/main/java/com/google/api/Http.java    |  65 ++-
 .../main/java/com/google/api/HttpBody.java    |  64 ++-
 .../java/com/google/api/HttpOrBuilder.java    |   6 -
 .../main/java/com/google/api/HttpRule.java    | 155 ++----
 .../com/google/api/HttpRuleOrBuilder.java     |   8 +-
 .../java/com/google/api/JavaSettings.java     |  74 +--
 .../com/google/api/JavaSettingsOrBuilder.java |  14 -
 .../main/java/com/google/api/JwtLocation.java |  47 +-
 .../com/google/api/JwtLocationOrBuilder.java  |   4 +-
 .../java/com/google/api/LabelDescriptor.java  |  38 ++
 .../java/com/google/api/LogDescriptor.java    |  40 +-
 .../src/main/java/com/google/api/Logging.java | 123 ++++-
 .../java/com/google/api/MethodSettings.java   | 106 +++-
 .../google/api/MethodSettingsOrBuilder.java   |   6 -
 .../src/main/java/com/google/api/Metric.java  |  38 ++
 .../java/com/google/api/MetricDescriptor.java | 255 ++++-----
 .../google/api/MetricDescriptorOrBuilder.java |  40 --
 .../main/java/com/google/api/MetricRule.java  |  56 +-
 .../com/google/api/MetricRuleOrBuilder.java   |   7 -
 .../com/google/api/MonitoredResource.java     |  40 +-
 .../api/MonitoredResourceDescriptor.java      |  40 +-
 .../google/api/MonitoredResourceMetadata.java |  50 +-
 .../MonitoredResourceMetadataOrBuilder.java   |   3 -
 .../main/java/com/google/api/Monitoring.java  | 124 ++++-
 .../java/com/google/api/NodeSettings.java     |  38 ++
 .../com/google/api/OAuthRequirements.java     |  60 ++-
 .../api/OAuthRequirementsOrBuilder.java       |   4 -
 .../src/main/java/com/google/api/Page.java    |  38 ++
 .../main/java/com/google/api/PhpSettings.java |  38 ++
 .../com/google/api/ProjectProperties.java     |  42 +-
 .../main/java/com/google/api/Property.java    |  42 +-
 .../main/java/com/google/api/Publishing.java  |  75 ++-
 .../java/com/google/api/PythonSettings.java   |  38 ++
 .../src/main/java/com/google/api/Quota.java   |  56 +-
 .../main/java/com/google/api/QuotaLimit.java  |  93 ++--
 .../com/google/api/QuotaLimitOrBuilder.java   |  15 -
 .../com/google/api/ResourceDescriptor.java    | 199 ++-----
 .../api/ResourceDescriptorOrBuilder.java      |  30 --
 .../com/google/api/ResourceReference.java     |  87 ++-
 .../api/ResourceReferenceOrBuilder.java       |  14 -
 .../java/com/google/api/RoutingParameter.java |  94 ++--
 .../google/api/RoutingParameterOrBuilder.java |  16 -
 .../main/java/com/google/api/RoutingRule.java | 222 ++------
 .../java/com/google/api/RubySettings.java     |  38 ++
 .../src/main/java/com/google/api/Service.java | 104 ++--
 .../java/com/google/api/ServiceOrBuilder.java |  13 -
 .../main/java/com/google/api/SourceInfo.java  |  38 ++
 .../java/com/google/api/SystemParameter.java  |  38 ++
 .../com/google/api/SystemParameterRule.java   |  45 +-
 .../api/SystemParameterRuleOrBuilder.java     |   2 -
 .../java/com/google/api/SystemParameters.java | 201 ++-----
 .../google/api/SystemParametersOrBuilder.java |  35 --
 .../src/main/java/com/google/api/Usage.java   | 118 ++---
 .../java/com/google/api/UsageOrBuilder.java   |  11 -
 .../main/java/com/google/api/UsageRule.java   |  59 ++-
 .../com/google/api/UsageRuleOrBuilder.java    |   2 -
 .../main/java/com/google/api/Visibility.java  |  71 +--
 .../com/google/api/VisibilityOrBuilder.java   |   5 -
 .../java/com/google/api/VisibilityRule.java   |  73 +--
 .../google/api/VisibilityRuleOrBuilder.java   |  10 -
 .../java/com/google/cloud/audit/AuditLog.java |  52 +-
 .../google/cloud/audit/AuditLogOrBuilder.java |   4 -
 .../com/google/cloud/audit/AuditLogProto.java |  36 +-
 .../cloud/audit/AuthenticationInfo.java       |  45 +-
 .../audit/AuthenticationInfoOrBuilder.java    |   2 -
 .../google/cloud/audit/AuthorizationInfo.java |  57 +-
 .../audit/AuthorizationInfoOrBuilder.java     |   5 -
 .../cloud/audit/OrgPolicyViolationInfo.java   |  49 +-
 .../OrgPolicyViolationInfoOrBuilder.java      |   5 -
 .../cloud/audit/PolicyViolationInfo.java      |  38 ++
 .../google/cloud/audit/RequestMetadata.java   |  76 +--
 .../cloud/audit/RequestMetadataOrBuilder.java |  10 -
 .../google/cloud/audit/ResourceLocation.java  | 142 ++---
 .../audit/ResourceLocationOrBuilder.java      |   8 -
 .../audit/ServiceAccountDelegationInfo.java   | 120 ++++-
 ...ServiceAccountDelegationInfoOrBuilder.java |   2 +-
 .../com/google/cloud/audit/ViolationInfo.java |  38 ++
 .../cloud/location/GetLocationRequest.java    |  38 ++
 .../cloud/location/ListLocationsRequest.java  |  38 ++
 .../cloud/location/ListLocationsResponse.java |  38 ++
 .../com/google/cloud/location/Location.java   |  49 +-
 .../cloud/location/LocationOrBuilder.java     |   5 -
 .../java/com/google/geo/type/Viewport.java    |  54 +-
 .../com/google/logging/type/HttpRequest.java  |  38 ++
 .../com/google/logging/type/LogSeverity.java  |   3 -
 .../longrunning/CancelOperationRequest.java   |  38 ++
 .../longrunning/DeleteOperationRequest.java   |  38 ++
 .../longrunning/GetOperationRequest.java      |  38 ++
 .../longrunning/ListOperationsRequest.java    |  38 ++
 .../longrunning/ListOperationsResponse.java   |  38 ++
 .../com/google/longrunning/Operation.java     |  40 +-
 .../com/google/longrunning/OperationInfo.java |  70 +--
 .../longrunning/OperationInfoOrBuilder.java   |   8 -
 .../longrunning/OperationOrBuilder.java       |   2 +-
 .../google/longrunning/OperationsProto.java   |  17 +-
 .../longrunning/WaitOperationRequest.java     |  38 ++
 .../main/java/com/google/rpc/BadRequest.java  | 150 +++---
 .../src/main/java/com/google/rpc/Code.java    |  48 --
 .../main/java/com/google/rpc/DebugInfo.java   |  79 ++-
 .../main/java/com/google/rpc/ErrorInfo.java   |  59 ++-
 .../com/google/rpc/ErrorInfoOrBuilder.java    |   5 -
 .../src/main/java/com/google/rpc/Help.java    |  80 ++-
 .../java/com/google/rpc/LocalizedMessage.java |  38 ++
 .../com/google/rpc/PreconditionFailure.java   |  89 +++-
 .../java/com/google/rpc/QuotaFailure.java     |  91 +++-
 .../main/java/com/google/rpc/RequestInfo.java |  38 ++
 .../java/com/google/rpc/ResourceInfo.java     |  38 ++
 .../main/java/com/google/rpc/RetryInfo.java   |  42 +-
 .../src/main/java/com/google/rpc/Status.java  |  40 +-
 .../google/rpc/context/AttributeContext.java  | 497 +++++++++++-------
 .../com/google/rpc/context/AuditContext.java  |  38 ++
 .../src/main/java/com/google/type/Color.java  |  96 ++--
 .../java/com/google/type/ColorOrBuilder.java  |   6 -
 .../src/main/java/com/google/type/Date.java   |  42 +-
 .../main/java/com/google/type/DateTime.java   |  52 +-
 .../com/google/type/DateTimeOrBuilder.java    |   2 +-
 .../main/java/com/google/type/Decimal.java    | 152 ++----
 .../com/google/type/DecimalOrBuilder.java     |  32 --
 .../src/main/java/com/google/type/Expr.java   |  56 +-
 .../main/java/com/google/type/Fraction.java   |  38 ++
 .../main/java/com/google/type/Interval.java   |  64 ++-
 .../com/google/type/IntervalOrBuilder.java    |   6 -
 .../src/main/java/com/google/type/LatLng.java |  38 ++
 .../java/com/google/type/LocalizedText.java   |  45 +-
 .../google/type/LocalizedTextOrBuilder.java   |   2 -
 .../src/main/java/com/google/type/Money.java  |  38 ++
 .../java/com/google/type/PhoneNumber.java     | 142 ++---
 .../com/google/type/PhoneNumberOrBuilder.java |  13 +-
 .../java/com/google/type/PostalAddress.java   | 179 +++----
 .../google/type/PostalAddressOrBuilder.java   |  17 -
 .../main/java/com/google/type/Quaternion.java |  62 ++-
 .../main/java/com/google/type/TimeOfDay.java  |  38 ++
 .../main/java/com/google/type/TimeZone.java   |  38 ++
 .../src/main/proto/google/api/client.proto    |   2 +-
 172 files changed, 5684 insertions(+), 3944 deletions(-)

diff --git a/java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml b/java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml
index 6b1aaa345b..999a997772 100644
--- a/java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml
+++ b/java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 <differences>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* addRepeatedField(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* clearField(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* clearOneof(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* clone()</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* setField(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* setRepeatedField(*)</method>
-  </difference>
   <difference>
     <differenceType>7012</differenceType>
     <className>com/google/api/*OrBuilder</className>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
index 1497403693..16305c553e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Advice();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
   }
@@ -347,6 +352,39 @@ private void buildPartial0(com.google.api.Advice result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Advice) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
index 52083e4a44..b5e3be7c88 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
@@ -54,6 +54,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuthProvider();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_AuthProvider_descriptor;
   }
@@ -76,7 +81,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    * </pre>
    *
@@ -102,7 +106,6 @@ public java.lang.String getId() {
    * <pre>
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    * </pre>
    *
@@ -134,7 +137,6 @@ public com.google.protobuf.ByteString getIdBytes() {
    * Identifies the principal that issued the JWT. See
    * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
    * Usually a URL or an email address.
-   *
    * Example: https://securetoken.google.com
    * Example: 1234567-compute&#64;developer.gserviceaccount.com
    * </pre>
@@ -162,7 +164,6 @@ public java.lang.String getIssuer() {
    * Identifies the principal that issued the JWT. See
    * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
    * Usually a URL or an email address.
-   *
    * Example: https://securetoken.google.com
    * Example: 1234567-compute&#64;developer.gserviceaccount.com
    * </pre>
@@ -202,7 +203,6 @@ public com.google.protobuf.ByteString getIssuerBytes() {
    *    of the issuer.
    *  - can be inferred from the email domain of the issuer (e.g. a Google
    *  service account).
-   *
    * Example: https://www.googleapis.com/oauth2/v1/certs
    * </pre>
    *
@@ -236,7 +236,6 @@ public java.lang.String getJwksUri() {
    *    of the issuer.
    *  - can be inferred from the email domain of the issuer (e.g. a Google
    *  service account).
-   *
    * Example: https://www.googleapis.com/oauth2/v1/certs
    * </pre>
    *
@@ -277,9 +276,7 @@ public com.google.protobuf.ByteString getJwksUriBytes() {
    *   -
    *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
    *   - https://library-example.googleapis.com/
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -316,9 +313,7 @@ public java.lang.String getAudiences() {
    *   -
    *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
    *   - https://library-example.googleapis.com/
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -404,15 +399,12 @@ public com.google.protobuf.ByteString getAuthorizationUrlBytes() {
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -434,15 +426,12 @@ public java.util.List<com.google.api.JwtLocation> getJwtLocationsList() {
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -465,15 +454,12 @@ public java.util.List<com.google.api.JwtLocation> getJwtLocationsList() {
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -495,15 +481,12 @@ public int getJwtLocationsCount() {
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -525,15 +508,12 @@ public com.google.api.JwtLocation getJwtLocations(int index) {
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -867,6 +847,39 @@ private void buildPartial0(com.google.api.AuthProvider result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.AuthProvider) {
@@ -1025,7 +1038,6 @@ public Builder mergeFrom(
      * <pre>
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      * </pre>
      *
@@ -1050,7 +1062,6 @@ public java.lang.String getId() {
      * <pre>
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      * </pre>
      *
@@ -1075,7 +1086,6 @@ public com.google.protobuf.ByteString getIdBytes() {
      * <pre>
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      * </pre>
      *
@@ -1099,7 +1109,6 @@ public Builder setId(java.lang.String value) {
      * <pre>
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      * </pre>
      *
@@ -1119,7 +1128,6 @@ public Builder clearId() {
      * <pre>
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      * </pre>
      *
@@ -1147,7 +1155,6 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
      * Identifies the principal that issued the JWT. See
      * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
      * Usually a URL or an email address.
-     *
      * Example: https://securetoken.google.com
      * Example: 1234567-compute&#64;developer.gserviceaccount.com
      * </pre>
@@ -1174,7 +1181,6 @@ public java.lang.String getIssuer() {
      * Identifies the principal that issued the JWT. See
      * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
      * Usually a URL or an email address.
-     *
      * Example: https://securetoken.google.com
      * Example: 1234567-compute&#64;developer.gserviceaccount.com
      * </pre>
@@ -1201,7 +1207,6 @@ public com.google.protobuf.ByteString getIssuerBytes() {
      * Identifies the principal that issued the JWT. See
      * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
      * Usually a URL or an email address.
-     *
      * Example: https://securetoken.google.com
      * Example: 1234567-compute&#64;developer.gserviceaccount.com
      * </pre>
@@ -1227,7 +1232,6 @@ public Builder setIssuer(java.lang.String value) {
      * Identifies the principal that issued the JWT. See
      * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
      * Usually a URL or an email address.
-     *
      * Example: https://securetoken.google.com
      * Example: 1234567-compute&#64;developer.gserviceaccount.com
      * </pre>
@@ -1249,7 +1253,6 @@ public Builder clearIssuer() {
      * Identifies the principal that issued the JWT. See
      * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
      * Usually a URL or an email address.
-     *
      * Example: https://securetoken.google.com
      * Example: 1234567-compute&#64;developer.gserviceaccount.com
      * </pre>
@@ -1285,7 +1288,6 @@ public Builder setIssuerBytes(com.google.protobuf.ByteString value) {
      *    of the issuer.
      *  - can be inferred from the email domain of the issuer (e.g. a Google
      *  service account).
-     *
      * Example: https://www.googleapis.com/oauth2/v1/certs
      * </pre>
      *
@@ -1318,7 +1320,6 @@ public java.lang.String getJwksUri() {
      *    of the issuer.
      *  - can be inferred from the email domain of the issuer (e.g. a Google
      *  service account).
-     *
      * Example: https://www.googleapis.com/oauth2/v1/certs
      * </pre>
      *
@@ -1351,7 +1352,6 @@ public com.google.protobuf.ByteString getJwksUriBytes() {
      *    of the issuer.
      *  - can be inferred from the email domain of the issuer (e.g. a Google
      *  service account).
-     *
      * Example: https://www.googleapis.com/oauth2/v1/certs
      * </pre>
      *
@@ -1383,7 +1383,6 @@ public Builder setJwksUri(java.lang.String value) {
      *    of the issuer.
      *  - can be inferred from the email domain of the issuer (e.g. a Google
      *  service account).
-     *
      * Example: https://www.googleapis.com/oauth2/v1/certs
      * </pre>
      *
@@ -1411,7 +1410,6 @@ public Builder clearJwksUri() {
      *    of the issuer.
      *  - can be inferred from the email domain of the issuer (e.g. a Google
      *  service account).
-     *
      * Example: https://www.googleapis.com/oauth2/v1/certs
      * </pre>
      *
@@ -1448,9 +1446,7 @@ public Builder setJwksUriBytes(com.google.protobuf.ByteString value) {
      *   -
      *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
      *   - https://library-example.googleapis.com/
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -1486,9 +1482,7 @@ public java.lang.String getAudiences() {
      *   -
      *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
      *   - https://library-example.googleapis.com/
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -1524,9 +1518,7 @@ public com.google.protobuf.ByteString getAudiencesBytes() {
      *   -
      *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
      *   - https://library-example.googleapis.com/
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -1561,9 +1553,7 @@ public Builder setAudiences(java.lang.String value) {
      *   -
      *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
      *   - https://library-example.googleapis.com/
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -1594,9 +1584,7 @@ public Builder clearAudiences() {
      *   -
      *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
      *   - https://library-example.googleapis.com/
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -1751,15 +1739,12 @@ private void ensureJwtLocationsIsMutable() {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -1784,15 +1769,12 @@ public java.util.List<com.google.api.JwtLocation> getJwtLocationsList() {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -1817,15 +1799,12 @@ public int getJwtLocationsCount() {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -1850,15 +1829,12 @@ public com.google.api.JwtLocation getJwtLocations(int index) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -1889,15 +1865,12 @@ public Builder setJwtLocations(int index, com.google.api.JwtLocation value) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -1925,15 +1898,12 @@ public Builder setJwtLocations(int index, com.google.api.JwtLocation.Builder bui
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -1964,15 +1934,12 @@ public Builder addJwtLocations(com.google.api.JwtLocation value) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2003,15 +1970,12 @@ public Builder addJwtLocations(int index, com.google.api.JwtLocation value) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2039,15 +2003,12 @@ public Builder addJwtLocations(com.google.api.JwtLocation.Builder builderForValu
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2075,15 +2036,12 @@ public Builder addJwtLocations(int index, com.google.api.JwtLocation.Builder bui
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2112,15 +2070,12 @@ public Builder addAllJwtLocations(
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2148,15 +2103,12 @@ public Builder clearJwtLocations() {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2184,15 +2136,12 @@ public Builder removeJwtLocations(int index) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2213,15 +2162,12 @@ public com.google.api.JwtLocation.Builder getJwtLocationsBuilder(int index) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2246,15 +2192,12 @@ public com.google.api.JwtLocationOrBuilder getJwtLocationsOrBuilder(int index) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2280,15 +2223,12 @@ public com.google.api.JwtLocationOrBuilder getJwtLocationsOrBuilder(int index) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2310,15 +2250,12 @@ public com.google.api.JwtLocation.Builder addJwtLocationsBuilder() {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
@@ -2340,15 +2277,12 @@ public com.google.api.JwtLocation.Builder addJwtLocationsBuilder(int index) {
      * Defines the locations to extract the JWT.  For now it is only used by the
      * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
      * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-     *
      * JWT locations can be one of HTTP headers, URL query parameters or
      * cookies. The rule is that the first match wins.
-     *
      * If not specified,  default to use following 3 locations:
      *    1) Authorization: Bearer
      *    2) x-goog-iap-jwt-assertion
      *    3) access_token query parameter
-     *
      * Default locations can be specified as followings:
      *    jwt_locations:
      *    - header: Authorization
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProviderOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProviderOrBuilder.java
index ac0f0426ee..87ac693a46 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProviderOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProviderOrBuilder.java
@@ -29,7 +29,6 @@ public interface AuthProviderOrBuilder
    * <pre>
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    * </pre>
    *
@@ -44,7 +43,6 @@ public interface AuthProviderOrBuilder
    * <pre>
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    * </pre>
    *
@@ -61,7 +59,6 @@ public interface AuthProviderOrBuilder
    * Identifies the principal that issued the JWT. See
    * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
    * Usually a URL or an email address.
-   *
    * Example: https://securetoken.google.com
    * Example: 1234567-compute&#64;developer.gserviceaccount.com
    * </pre>
@@ -78,7 +75,6 @@ public interface AuthProviderOrBuilder
    * Identifies the principal that issued the JWT. See
    * https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
    * Usually a URL or an email address.
-   *
    * Example: https://securetoken.google.com
    * Example: 1234567-compute&#64;developer.gserviceaccount.com
    * </pre>
@@ -103,7 +99,6 @@ public interface AuthProviderOrBuilder
    *    of the issuer.
    *  - can be inferred from the email domain of the issuer (e.g. a Google
    *  service account).
-   *
    * Example: https://www.googleapis.com/oauth2/v1/certs
    * </pre>
    *
@@ -126,7 +121,6 @@ public interface AuthProviderOrBuilder
    *    of the issuer.
    *  - can be inferred from the email domain of the issuer (e.g. a Google
    *  service account).
-   *
    * Example: https://www.googleapis.com/oauth2/v1/certs
    * </pre>
    *
@@ -152,9 +146,7 @@ public interface AuthProviderOrBuilder
    *   -
    *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
    *   - https://library-example.googleapis.com/
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -180,9 +172,7 @@ public interface AuthProviderOrBuilder
    *   -
    *   https://library-example.googleapis.com/google.example.library.v1.LibraryService
    *   - https://library-example.googleapis.com/
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -227,15 +217,12 @@ public interface AuthProviderOrBuilder
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -254,15 +241,12 @@ public interface AuthProviderOrBuilder
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -281,15 +265,12 @@ public interface AuthProviderOrBuilder
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -308,15 +289,12 @@ public interface AuthProviderOrBuilder
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
@@ -335,15 +313,12 @@ public interface AuthProviderOrBuilder
    * Defines the locations to extract the JWT.  For now it is only used by the
    * Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
    * (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
-   *
    * JWT locations can be one of HTTP headers, URL query parameters or
    * cookies. The rule is that the first match wins.
-   *
    * If not specified,  default to use following 3 locations:
    *    1) Authorization: Bearer
    *    2) x-goog-iap-jwt-assertion
    *    3) access_token query parameter
-   *
    * Default locations can be specified as followings:
    *    jwt_locations:
    *    - header: Authorization
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
index cb424414e2..1c3418f5f3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuthRequirement();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_descriptor;
   }
@@ -71,9 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    * </pre>
    *
@@ -98,9 +101,7 @@ public java.lang.String getProviderId() {
    *
    * <pre>
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    * </pre>
    *
@@ -131,7 +132,6 @@ public com.google.protobuf.ByteString getProviderIdBytes() {
    * <pre>
    * NOTE: This will be deprecated soon, once AuthProvider.audiences is
    * implemented and accepted in all the runtime components.
-   *
    * The list of JWT
    * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
    * that are allowed to access. A JWT containing any of these audiences will
@@ -140,9 +140,7 @@ public com.google.protobuf.ByteString getProviderIdBytes() {
    * will be accepted. For example, if no audiences are in the setting,
    * LibraryService API will only accept JWTs with the following audience
    * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -169,7 +167,6 @@ public java.lang.String getAudiences() {
    * <pre>
    * NOTE: This will be deprecated soon, once AuthProvider.audiences is
    * implemented and accepted in all the runtime components.
-   *
    * The list of JWT
    * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
    * that are allowed to access. A JWT containing any of these audiences will
@@ -178,9 +175,7 @@ public java.lang.String getAudiences() {
    * will be accepted. For example, if no audiences are in the setting,
    * LibraryService API will only accept JWTs with the following audience
    * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -450,6 +445,39 @@ private void buildPartial0(com.google.api.AuthRequirement result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.AuthRequirement) {
@@ -535,9 +563,7 @@ public Builder mergeFrom(
      *
      * <pre>
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      * </pre>
      *
@@ -561,9 +587,7 @@ public java.lang.String getProviderId() {
      *
      * <pre>
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      * </pre>
      *
@@ -587,9 +611,7 @@ public com.google.protobuf.ByteString getProviderIdBytes() {
      *
      * <pre>
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      * </pre>
      *
@@ -612,9 +634,7 @@ public Builder setProviderId(java.lang.String value) {
      *
      * <pre>
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      * </pre>
      *
@@ -633,9 +653,7 @@ public Builder clearProviderId() {
      *
      * <pre>
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      * </pre>
      *
@@ -662,7 +680,6 @@ public Builder setProviderIdBytes(com.google.protobuf.ByteString value) {
      * <pre>
      * NOTE: This will be deprecated soon, once AuthProvider.audiences is
      * implemented and accepted in all the runtime components.
-     *
      * The list of JWT
      * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
      * that are allowed to access. A JWT containing any of these audiences will
@@ -671,9 +688,7 @@ public Builder setProviderIdBytes(com.google.protobuf.ByteString value) {
      * will be accepted. For example, if no audiences are in the setting,
      * LibraryService API will only accept JWTs with the following audience
      * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -699,7 +714,6 @@ public java.lang.String getAudiences() {
      * <pre>
      * NOTE: This will be deprecated soon, once AuthProvider.audiences is
      * implemented and accepted in all the runtime components.
-     *
      * The list of JWT
      * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
      * that are allowed to access. A JWT containing any of these audiences will
@@ -708,9 +722,7 @@ public java.lang.String getAudiences() {
      * will be accepted. For example, if no audiences are in the setting,
      * LibraryService API will only accept JWTs with the following audience
      * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -736,7 +748,6 @@ public com.google.protobuf.ByteString getAudiencesBytes() {
      * <pre>
      * NOTE: This will be deprecated soon, once AuthProvider.audiences is
      * implemented and accepted in all the runtime components.
-     *
      * The list of JWT
      * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
      * that are allowed to access. A JWT containing any of these audiences will
@@ -745,9 +756,7 @@ public com.google.protobuf.ByteString getAudiencesBytes() {
      * will be accepted. For example, if no audiences are in the setting,
      * LibraryService API will only accept JWTs with the following audience
      * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -772,7 +781,6 @@ public Builder setAudiences(java.lang.String value) {
      * <pre>
      * NOTE: This will be deprecated soon, once AuthProvider.audiences is
      * implemented and accepted in all the runtime components.
-     *
      * The list of JWT
      * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
      * that are allowed to access. A JWT containing any of these audiences will
@@ -781,9 +789,7 @@ public Builder setAudiences(java.lang.String value) {
      * will be accepted. For example, if no audiences are in the setting,
      * LibraryService API will only accept JWTs with the following audience
      * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
@@ -804,7 +810,6 @@ public Builder clearAudiences() {
      * <pre>
      * NOTE: This will be deprecated soon, once AuthProvider.audiences is
      * implemented and accepted in all the runtime components.
-     *
      * The list of JWT
      * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
      * that are allowed to access. A JWT containing any of these audiences will
@@ -813,9 +818,7 @@ public Builder clearAudiences() {
      * will be accepted. For example, if no audiences are in the setting,
      * LibraryService API will only accept JWTs with the following audience
      * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-     *
      * Example:
-     *
      *     audiences: bookstore_android.apps.googleusercontent.com,
      *                bookstore_web.apps.googleusercontent.com
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirementOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirementOrBuilder.java
index 86a8a37c7c..da45b4a941 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirementOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirementOrBuilder.java
@@ -28,9 +28,7 @@ public interface AuthRequirementOrBuilder
    *
    * <pre>
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    * </pre>
    *
@@ -44,9 +42,7 @@ public interface AuthRequirementOrBuilder
    *
    * <pre>
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    * </pre>
    *
@@ -62,7 +58,6 @@ public interface AuthRequirementOrBuilder
    * <pre>
    * NOTE: This will be deprecated soon, once AuthProvider.audiences is
    * implemented and accepted in all the runtime components.
-   *
    * The list of JWT
    * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
    * that are allowed to access. A JWT containing any of these audiences will
@@ -71,9 +66,7 @@ public interface AuthRequirementOrBuilder
    * will be accepted. For example, if no audiences are in the setting,
    * LibraryService API will only accept JWTs with the following audience
    * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
@@ -89,7 +82,6 @@ public interface AuthRequirementOrBuilder
    * <pre>
    * NOTE: This will be deprecated soon, once AuthProvider.audiences is
    * implemented and accepted in all the runtime components.
-   *
    * The list of JWT
    * [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
    * that are allowed to access. A JWT containing any of these audiences will
@@ -98,9 +90,7 @@ public interface AuthRequirementOrBuilder
    * will be accepted. For example, if no audiences are in the setting,
    * LibraryService API will only accept JWTs with the following audience
    * "https://library-example.googleapis.com/google.example.library.v1.LibraryService".
-   *
    * Example:
-   *
    *     audiences: bookstore_android.apps.googleusercontent.com,
    *                bookstore_web.apps.googleusercontent.com
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
index c3e5c2f8b2..cc415379a2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
@@ -24,9 +24,7 @@
  * <pre>
  * `Authentication` defines the authentication configuration for API methods
  * provided by an API service.
- *
  * Example:
- *
  *     name: calendar.googleapis.com
  *     authentication:
  *       providers:
@@ -65,6 +63,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Authentication();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_Authentication_descriptor;
   }
@@ -86,7 +89,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -101,7 +103,6 @@ public java.util.List<com.google.api.AuthenticationRule> getRulesList() {
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -117,7 +118,6 @@ public java.util.List<com.google.api.AuthenticationRule> getRulesList() {
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -132,7 +132,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -147,7 +146,6 @@ public com.google.api.AuthenticationRule getRules(int index) {
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -405,9 +403,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre>
    * `Authentication` defines the authentication configuration for API methods
    * provided by an API service.
-   *
    * Example:
-   *
    *     name: calendar.googleapis.com
    *     authentication:
    *       providers:
@@ -524,6 +520,39 @@ private void buildPartial0(com.google.api.Authentication result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Authentication) {
@@ -681,7 +710,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -699,7 +727,6 @@ public java.util.List<com.google.api.AuthenticationRule> getRulesList() {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -717,7 +744,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -735,7 +761,6 @@ public com.google.api.AuthenticationRule getRules(int index) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -759,7 +784,6 @@ public Builder setRules(int index, com.google.api.AuthenticationRule value) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -780,7 +804,6 @@ public Builder setRules(int index, com.google.api.AuthenticationRule.Builder bui
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -804,7 +827,6 @@ public Builder addRules(com.google.api.AuthenticationRule value) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -828,7 +850,6 @@ public Builder addRules(int index, com.google.api.AuthenticationRule value) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -849,7 +870,6 @@ public Builder addRules(com.google.api.AuthenticationRule.Builder builderForValu
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -870,7 +890,6 @@ public Builder addRules(int index, com.google.api.AuthenticationRule.Builder bui
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -892,7 +911,6 @@ public Builder addAllRules(
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -913,7 +931,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -934,7 +951,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -948,7 +964,6 @@ public com.google.api.AuthenticationRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -966,7 +981,6 @@ public com.google.api.AuthenticationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -985,7 +999,6 @@ public com.google.api.AuthenticationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1000,7 +1013,6 @@ public com.google.api.AuthenticationRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1015,7 +1027,6 @@ public com.google.api.AuthenticationRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationOrBuilder.java
index 148735aae4..d7dd35ee0e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationOrBuilder.java
@@ -28,7 +28,6 @@ public interface AuthenticationOrBuilder
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -40,7 +39,6 @@ public interface AuthenticationOrBuilder
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -52,7 +50,6 @@ public interface AuthenticationOrBuilder
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -64,7 +61,6 @@ public interface AuthenticationOrBuilder
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -76,7 +72,6 @@ public interface AuthenticationOrBuilder
    *
    * <pre>
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
index 801f7e8d26..15ab9eb377 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
@@ -23,12 +23,10 @@
  *
  * <pre>
  * Authentication rules for the service.
- *
  * By default, if a method has any authentication requirements, every request
  * must include a valid credential matching one of the requirements.
  * It's an error to include more than one kind of credential in a single
  * request.
- *
  * If a method doesn't have any auth requirements, request credentials will be
  * ignored.
  * </pre>
@@ -56,6 +54,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuthenticationRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_descriptor;
   }
@@ -78,7 +81,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -104,7 +106,6 @@ public java.lang.String getSelector() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -458,12 +459,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Authentication rules for the service.
-   *
    * By default, if a method has any authentication requirements, every request
    * must include a valid credential matching one of the requirements.
    * It's an error to include more than one kind of credential in a single
    * request.
-   *
    * If a method doesn't have any auth requirements, request credentials will be
    * ignored.
    * </pre>
@@ -571,6 +570,39 @@ private void buildPartial0(com.google.api.AuthenticationRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.AuthenticationRule) {
@@ -702,7 +734,6 @@ public Builder mergeFrom(
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -727,7 +758,6 @@ public java.lang.String getSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -752,7 +782,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -776,7 +805,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -796,7 +824,6 @@ public Builder clearSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRuleOrBuilder.java
index fdcffb5e88..ca38fc60e7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRuleOrBuilder.java
@@ -28,7 +28,6 @@ public interface AuthenticationRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -43,7 +42,6 @@ public interface AuthenticationRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java
index 2a3a35a847..316b08163d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Backend();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.BackendProto.internal_static_google_api_Backend_descriptor;
   }
@@ -68,7 +73,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -83,7 +87,6 @@ public java.util.List<com.google.api.BackendRule> getRulesList() {
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -98,7 +101,6 @@ public java.util.List<? extends com.google.api.BackendRuleOrBuilder> getRulesOrB
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -113,7 +115,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -128,7 +129,6 @@ public com.google.api.BackendRule getRules(int index) {
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -390,6 +390,39 @@ private void buildPartial0(com.google.api.Backend result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Backend) {
@@ -506,7 +539,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -524,7 +556,6 @@ public java.util.List<com.google.api.BackendRule> getRulesList() {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -542,7 +573,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -560,7 +590,6 @@ public com.google.api.BackendRule getRules(int index) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -584,7 +613,6 @@ public Builder setRules(int index, com.google.api.BackendRule value) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -605,7 +633,6 @@ public Builder setRules(int index, com.google.api.BackendRule.Builder builderFor
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -629,7 +656,6 @@ public Builder addRules(com.google.api.BackendRule value) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -653,7 +679,6 @@ public Builder addRules(int index, com.google.api.BackendRule value) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -674,7 +699,6 @@ public Builder addRules(com.google.api.BackendRule.Builder builderForValue) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -695,7 +719,6 @@ public Builder addRules(int index, com.google.api.BackendRule.Builder builderFor
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -716,7 +739,6 @@ public Builder addAllRules(java.lang.Iterable<? extends com.google.api.BackendRu
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -737,7 +759,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -758,7 +779,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -772,7 +792,6 @@ public com.google.api.BackendRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -790,7 +809,6 @@ public com.google.api.BackendRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -808,7 +826,6 @@ public java.util.List<? extends com.google.api.BackendRuleOrBuilder> getRulesOrB
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -822,7 +839,6 @@ public com.google.api.BackendRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -837,7 +853,6 @@ public com.google.api.BackendRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendOrBuilder.java
index 9649071c93..807191b594 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendOrBuilder.java
@@ -28,7 +28,6 @@ public interface BackendOrBuilder
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -40,7 +39,6 @@ public interface BackendOrBuilder
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -52,7 +50,6 @@ public interface BackendOrBuilder
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -64,7 +61,6 @@ public interface BackendOrBuilder
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -76,7 +72,6 @@ public interface BackendOrBuilder
    *
    * <pre>
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
index 161bb7092a..8eb90a0d77 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BackendRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.BackendProto.internal_static_google_api_BackendRule_descriptor;
   }
@@ -80,7 +85,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * Path Translation specifies how to combine the backend address with the
    * request path in order to produce the appropriate forwarding URL for the
    * request.
-   *
    * Path Translation is applicable only to HTTP-based backends. Backends which
    * do not accept requests over HTTP/HTTPS should leave `path_translation`
    * unspecified.
@@ -100,21 +104,15 @@ public enum PathTranslation implements com.google.protobuf.ProtocolMessageEnum {
      * appended to the query string. If a query string parameter and a URL
      * pattern variable have the same name, this may result in duplicate keys in
      * the query string.
-     *
      * # Examples
-     *
      * Given the following operation config:
-     *
      *     Method path:        /api/company/{cid}/user/{uid}
      *     Backend address:    https://example.cloudfunctions.net/getUser
-     *
      * Requests to the following request paths will call the backend at the
      * translated path:
-     *
      *     Request path: /api/company/widgetworks/user/johndoe
      *     Translated:
      *     https://example.cloudfunctions.net/getUser?cid=widgetworks&amp;uid=johndoe
-     *
      *     Request path: /api/company/widgetworks/user/johndoe?timezone=EST
      *     Translated:
      *     https://example.cloudfunctions.net/getUser?timezone=EST&amp;cid=widgetworks&amp;uid=johndoe
@@ -128,21 +126,15 @@ public enum PathTranslation implements com.google.protobuf.ProtocolMessageEnum {
      *
      * <pre>
      * The request path will be appended to the backend address.
-     *
      * # Examples
-     *
      * Given the following operation config:
-     *
      *     Method path:        /api/company/{cid}/user/{uid}
      *     Backend address:    https://example.appspot.com
-     *
      * Requests to the following request paths will call the backend at the
      * translated path:
-     *
      *     Request path: /api/company/widgetworks/user/johndoe
      *     Translated:
      *     https://example.appspot.com/api/company/widgetworks/user/johndoe
-     *
      *     Request path: /api/company/widgetworks/user/johndoe?timezone=EST
      *     Translated:
      *     https://example.appspot.com/api/company/widgetworks/user/johndoe?timezone=EST
@@ -165,21 +157,15 @@ public enum PathTranslation implements com.google.protobuf.ProtocolMessageEnum {
      * appended to the query string. If a query string parameter and a URL
      * pattern variable have the same name, this may result in duplicate keys in
      * the query string.
-     *
      * # Examples
-     *
      * Given the following operation config:
-     *
      *     Method path:        /api/company/{cid}/user/{uid}
      *     Backend address:    https://example.cloudfunctions.net/getUser
-     *
      * Requests to the following request paths will call the backend at the
      * translated path:
-     *
      *     Request path: /api/company/widgetworks/user/johndoe
      *     Translated:
      *     https://example.cloudfunctions.net/getUser?cid=widgetworks&amp;uid=johndoe
-     *
      *     Request path: /api/company/widgetworks/user/johndoe?timezone=EST
      *     Translated:
      *     https://example.cloudfunctions.net/getUser?timezone=EST&amp;cid=widgetworks&amp;uid=johndoe
@@ -193,21 +179,15 @@ public enum PathTranslation implements com.google.protobuf.ProtocolMessageEnum {
      *
      * <pre>
      * The request path will be appended to the backend address.
-     *
      * # Examples
-     *
      * Given the following operation config:
-     *
      *     Method path:        /api/company/{cid}/user/{uid}
      *     Backend address:    https://example.appspot.com
-     *
      * Requests to the following request paths will call the backend at the
      * translated path:
-     *
      *     Request path: /api/company/widgetworks/user/johndoe
      *     Translated:
      *     https://example.appspot.com/api/company/widgetworks/user/johndoe
-     *
      *     Request path: /api/company/widgetworks/user/johndoe?timezone=EST
      *     Translated:
      *     https://example.appspot.com/api/company/widgetworks/user/johndoe?timezone=EST
@@ -303,8 +283,6 @@ private PathTranslation(int value) {
   }
 
   private int authenticationCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object authentication_;
 
   public enum AuthenticationCase
@@ -360,7 +338,6 @@ public AuthenticationCase getAuthenticationCase() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -386,7 +363,6 @@ public java.lang.String getSelector() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -417,23 +393,18 @@ public com.google.protobuf.ByteString getSelectorBytes() {
    *
    * <pre>
    * The address of the API backend.
-   *
    * The scheme is used to determine the backend protocol and security.
    * The following schemes are accepted:
-   *
    *    SCHEME        PROTOCOL    SECURITY
    *    http://       HTTP        None
    *    https://      HTTP        TLS
    *    grpc://       gRPC        None
    *    grpcs://      gRPC        TLS
-   *
    * It is recommended to explicitly include a scheme. Leaving out the scheme
    * may cause constrasting behaviors across platforms.
-   *
    * If the port is unspecified, the default is:
    * - 80 for schemes without TLS
    * - 443 for schemes with TLS
-   *
    * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
    * to specify the protocol version.
    * </pre>
@@ -459,23 +430,18 @@ public java.lang.String getAddress() {
    *
    * <pre>
    * The address of the API backend.
-   *
    * The scheme is used to determine the backend protocol and security.
    * The following schemes are accepted:
-   *
    *    SCHEME        PROTOCOL    SECURITY
    *    http://       HTTP        None
    *    https://      HTTP        TLS
    *    grpc://       gRPC        None
    *    grpcs://      gRPC        TLS
-   *
    * It is recommended to explicitly include a scheme. Leaving out the scheme
    * may cause constrasting behaviors across platforms.
-   *
    * If the port is unspecified, the default is:
    * - 80 for schemes without TLS
    * - 443 for schemes with TLS
-   *
    * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
    * to specify the protocol version.
    * </pre>
@@ -706,22 +672,17 @@ public boolean getDisableAuth() {
    * <pre>
    * The protocol used for sending a request to the backend.
    * The supported values are "http/1.1" and "h2".
-   *
    * The default value is inferred from the scheme in the
    * [address][google.api.BackendRule.address] field:
-   *
    *    SCHEME        PROTOCOL
    *    http://       http/1.1
    *    https://      http/1.1
    *    grpc://       h2
    *    grpcs://      h2
-   *
    * For secure HTTP backends (https://) that support HTTP/2, set this field
    * to "h2" for improved performance.
-   *
    * Configuring this field to non-default values is only supported for secure
    * HTTP backends. This field will be ignored for all other backends.
-   *
    * See
    * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
    * for more details on the supported values.
@@ -749,22 +710,17 @@ public java.lang.String getProtocol() {
    * <pre>
    * The protocol used for sending a request to the backend.
    * The supported values are "http/1.1" and "h2".
-   *
    * The default value is inferred from the scheme in the
    * [address][google.api.BackendRule.address] field:
-   *
    *    SCHEME        PROTOCOL
    *    http://       http/1.1
    *    https://      http/1.1
    *    grpc://       h2
    *    grpcs://      h2
-   *
    * For secure HTTP backends (https://) that support HTTP/2, set this field
    * to "h2" for improved performance.
-   *
    * Configuring this field to non-default values is only supported for secure
    * HTTP backends. This field will be ignored for all other backends.
-   *
    * See
    * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
    * for more details on the supported values.
@@ -1317,6 +1273,39 @@ private void buildPartialOneofs(com.google.api.BackendRule result) {
       result.authentication_ = this.authentication_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.BackendRule) {
@@ -1513,7 +1502,6 @@ public Builder clearAuthentication() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -1538,7 +1526,6 @@ public java.lang.String getSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -1563,7 +1550,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -1587,7 +1573,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -1607,7 +1592,6 @@ public Builder clearSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -1634,23 +1618,18 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * The address of the API backend.
-     *
      * The scheme is used to determine the backend protocol and security.
      * The following schemes are accepted:
-     *
      *    SCHEME        PROTOCOL    SECURITY
      *    http://       HTTP        None
      *    https://      HTTP        TLS
      *    grpc://       gRPC        None
      *    grpcs://      gRPC        TLS
-     *
      * It is recommended to explicitly include a scheme. Leaving out the scheme
      * may cause constrasting behaviors across platforms.
-     *
      * If the port is unspecified, the default is:
      * - 80 for schemes without TLS
      * - 443 for schemes with TLS
-     *
      * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
      * to specify the protocol version.
      * </pre>
@@ -1675,23 +1654,18 @@ public java.lang.String getAddress() {
      *
      * <pre>
      * The address of the API backend.
-     *
      * The scheme is used to determine the backend protocol and security.
      * The following schemes are accepted:
-     *
      *    SCHEME        PROTOCOL    SECURITY
      *    http://       HTTP        None
      *    https://      HTTP        TLS
      *    grpc://       gRPC        None
      *    grpcs://      gRPC        TLS
-     *
      * It is recommended to explicitly include a scheme. Leaving out the scheme
      * may cause constrasting behaviors across platforms.
-     *
      * If the port is unspecified, the default is:
      * - 80 for schemes without TLS
      * - 443 for schemes with TLS
-     *
      * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
      * to specify the protocol version.
      * </pre>
@@ -1716,23 +1690,18 @@ public com.google.protobuf.ByteString getAddressBytes() {
      *
      * <pre>
      * The address of the API backend.
-     *
      * The scheme is used to determine the backend protocol and security.
      * The following schemes are accepted:
-     *
      *    SCHEME        PROTOCOL    SECURITY
      *    http://       HTTP        None
      *    https://      HTTP        TLS
      *    grpc://       gRPC        None
      *    grpcs://      gRPC        TLS
-     *
      * It is recommended to explicitly include a scheme. Leaving out the scheme
      * may cause constrasting behaviors across platforms.
-     *
      * If the port is unspecified, the default is:
      * - 80 for schemes without TLS
      * - 443 for schemes with TLS
-     *
      * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
      * to specify the protocol version.
      * </pre>
@@ -1756,23 +1725,18 @@ public Builder setAddress(java.lang.String value) {
      *
      * <pre>
      * The address of the API backend.
-     *
      * The scheme is used to determine the backend protocol and security.
      * The following schemes are accepted:
-     *
      *    SCHEME        PROTOCOL    SECURITY
      *    http://       HTTP        None
      *    https://      HTTP        TLS
      *    grpc://       gRPC        None
      *    grpcs://      gRPC        TLS
-     *
      * It is recommended to explicitly include a scheme. Leaving out the scheme
      * may cause constrasting behaviors across platforms.
-     *
      * If the port is unspecified, the default is:
      * - 80 for schemes without TLS
      * - 443 for schemes with TLS
-     *
      * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
      * to specify the protocol version.
      * </pre>
@@ -1792,23 +1756,18 @@ public Builder clearAddress() {
      *
      * <pre>
      * The address of the API backend.
-     *
      * The scheme is used to determine the backend protocol and security.
      * The following schemes are accepted:
-     *
      *    SCHEME        PROTOCOL    SECURITY
      *    http://       HTTP        None
      *    https://      HTTP        TLS
      *    grpc://       gRPC        None
      *    grpcs://      gRPC        TLS
-     *
      * It is recommended to explicitly include a scheme. Leaving out the scheme
      * may cause constrasting behaviors across platforms.
-     *
      * If the port is unspecified, the default is:
      * - 80 for schemes without TLS
      * - 443 for schemes with TLS
-     *
      * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
      * to specify the protocol version.
      * </pre>
@@ -2298,22 +2257,17 @@ public Builder clearDisableAuth() {
      * <pre>
      * The protocol used for sending a request to the backend.
      * The supported values are "http/1.1" and "h2".
-     *
      * The default value is inferred from the scheme in the
      * [address][google.api.BackendRule.address] field:
-     *
      *    SCHEME        PROTOCOL
      *    http://       http/1.1
      *    https://      http/1.1
      *    grpc://       h2
      *    grpcs://      h2
-     *
      * For secure HTTP backends (https://) that support HTTP/2, set this field
      * to "h2" for improved performance.
-     *
      * Configuring this field to non-default values is only supported for secure
      * HTTP backends. This field will be ignored for all other backends.
-     *
      * See
      * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
      * for more details on the supported values.
@@ -2340,22 +2294,17 @@ public java.lang.String getProtocol() {
      * <pre>
      * The protocol used for sending a request to the backend.
      * The supported values are "http/1.1" and "h2".
-     *
      * The default value is inferred from the scheme in the
      * [address][google.api.BackendRule.address] field:
-     *
      *    SCHEME        PROTOCOL
      *    http://       http/1.1
      *    https://      http/1.1
      *    grpc://       h2
      *    grpcs://      h2
-     *
      * For secure HTTP backends (https://) that support HTTP/2, set this field
      * to "h2" for improved performance.
-     *
      * Configuring this field to non-default values is only supported for secure
      * HTTP backends. This field will be ignored for all other backends.
-     *
      * See
      * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
      * for more details on the supported values.
@@ -2382,22 +2331,17 @@ public com.google.protobuf.ByteString getProtocolBytes() {
      * <pre>
      * The protocol used for sending a request to the backend.
      * The supported values are "http/1.1" and "h2".
-     *
      * The default value is inferred from the scheme in the
      * [address][google.api.BackendRule.address] field:
-     *
      *    SCHEME        PROTOCOL
      *    http://       http/1.1
      *    https://      http/1.1
      *    grpc://       h2
      *    grpcs://      h2
-     *
      * For secure HTTP backends (https://) that support HTTP/2, set this field
      * to "h2" for improved performance.
-     *
      * Configuring this field to non-default values is only supported for secure
      * HTTP backends. This field will be ignored for all other backends.
-     *
      * See
      * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
      * for more details on the supported values.
@@ -2423,22 +2367,17 @@ public Builder setProtocol(java.lang.String value) {
      * <pre>
      * The protocol used for sending a request to the backend.
      * The supported values are "http/1.1" and "h2".
-     *
      * The default value is inferred from the scheme in the
      * [address][google.api.BackendRule.address] field:
-     *
      *    SCHEME        PROTOCOL
      *    http://       http/1.1
      *    https://      http/1.1
      *    grpc://       h2
      *    grpcs://      h2
-     *
      * For secure HTTP backends (https://) that support HTTP/2, set this field
      * to "h2" for improved performance.
-     *
      * Configuring this field to non-default values is only supported for secure
      * HTTP backends. This field will be ignored for all other backends.
-     *
      * See
      * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
      * for more details on the supported values.
@@ -2460,22 +2399,17 @@ public Builder clearProtocol() {
      * <pre>
      * The protocol used for sending a request to the backend.
      * The supported values are "http/1.1" and "h2".
-     *
      * The default value is inferred from the scheme in the
      * [address][google.api.BackendRule.address] field:
-     *
      *    SCHEME        PROTOCOL
      *    http://       http/1.1
      *    https://      http/1.1
      *    grpc://       h2
      *    grpcs://      h2
-     *
      * For secure HTTP backends (https://) that support HTTP/2, set this field
      * to "h2" for improved performance.
-     *
      * Configuring this field to non-default values is only supported for secure
      * HTTP backends. This field will be ignored for all other backends.
-     *
      * See
      * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
      * for more details on the supported values.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRuleOrBuilder.java
index e1cc5b2630..e4d76647a7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRuleOrBuilder.java
@@ -28,7 +28,6 @@ public interface BackendRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -43,7 +42,6 @@ public interface BackendRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -59,23 +57,18 @@ public interface BackendRuleOrBuilder
    *
    * <pre>
    * The address of the API backend.
-   *
    * The scheme is used to determine the backend protocol and security.
    * The following schemes are accepted:
-   *
    *    SCHEME        PROTOCOL    SECURITY
    *    http://       HTTP        None
    *    https://      HTTP        TLS
    *    grpc://       gRPC        None
    *    grpcs://      gRPC        TLS
-   *
    * It is recommended to explicitly include a scheme. Leaving out the scheme
    * may cause constrasting behaviors across platforms.
-   *
    * If the port is unspecified, the default is:
    * - 80 for schemes without TLS
    * - 443 for schemes with TLS
-   *
    * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
    * to specify the protocol version.
    * </pre>
@@ -90,23 +83,18 @@ public interface BackendRuleOrBuilder
    *
    * <pre>
    * The address of the API backend.
-   *
    * The scheme is used to determine the backend protocol and security.
    * The following schemes are accepted:
-   *
    *    SCHEME        PROTOCOL    SECURITY
    *    http://       HTTP        None
    *    https://      HTTP        TLS
    *    grpc://       gRPC        None
    *    grpcs://      gRPC        TLS
-   *
    * It is recommended to explicitly include a scheme. Leaving out the scheme
    * may cause constrasting behaviors across platforms.
-   *
    * If the port is unspecified, the default is:
    * - 80 for schemes without TLS
    * - 443 for schemes with TLS
-   *
    * For HTTP backends, use [protocol][google.api.BackendRule.protocol]
    * to specify the protocol version.
    * </pre>
@@ -254,22 +242,17 @@ public interface BackendRuleOrBuilder
    * <pre>
    * The protocol used for sending a request to the backend.
    * The supported values are "http/1.1" and "h2".
-   *
    * The default value is inferred from the scheme in the
    * [address][google.api.BackendRule.address] field:
-   *
    *    SCHEME        PROTOCOL
    *    http://       http/1.1
    *    https://      http/1.1
    *    grpc://       h2
    *    grpcs://      h2
-   *
    * For secure HTTP backends (https://) that support HTTP/2, set this field
    * to "h2" for improved performance.
-   *
    * Configuring this field to non-default values is only supported for secure
    * HTTP backends. This field will be ignored for all other backends.
-   *
    * See
    * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
    * for more details on the supported values.
@@ -286,22 +269,17 @@ public interface BackendRuleOrBuilder
    * <pre>
    * The protocol used for sending a request to the backend.
    * The supported values are "http/1.1" and "h2".
-   *
    * The default value is inferred from the scheme in the
    * [address][google.api.BackendRule.address] field:
-   *
    *    SCHEME        PROTOCOL
    *    http://       http/1.1
    *    https://      http/1.1
    *    grpc://       h2
    *    grpcs://      h2
-   *
    * For secure HTTP backends (https://) that support HTTP/2, set this field
    * to "h2" for improved performance.
-   *
    * Configuring this field to non-default values is only supported for secure
    * HTTP backends. This field will be ignored for all other backends.
-   *
    * See
    * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
    * for more details on the supported values.
@@ -371,5 +349,5 @@ com.google.api.BackendRule getOverridesByRequestProtocolOrDefault(
    */
   com.google.api.BackendRule getOverridesByRequestProtocolOrThrow(java.lang.String key);
 
-  com.google.api.BackendRule.AuthenticationCase getAuthenticationCase();
+  public com.google.api.BackendRule.AuthenticationCase getAuthenticationCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Billing.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Billing.java
index 77a1b33e54..081f409851 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Billing.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Billing.java
@@ -23,15 +23,12 @@
  *
  * <pre>
  * Billing related configuration of the service.
- *
  * The following example shows how to configure monitored resources and metrics
  * for billing, `consumer_destinations` is the only supported destination and
  * the monitored resources need at least one label key
  * `cloud.googleapis.com/location` to indicate the location of the billing
  * usage, using different monitored resources between monitoring and billing is
  * recommended so they can be evolved independently:
- *
- *
  *     monitored_resources:
  *     - type: library.googleapis.com/billing_branch
  *       labels:
@@ -78,6 +75,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Billing();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.BillingProto.internal_static_google_api_Billing_descriptor;
   }
@@ -205,7 +207,7 @@ private BillingDestination(com.google.protobuf.GeneratedMessageV3.Builder<?> bui
 
     private BillingDestination() {
       monitoredResource_ = "";
-      metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -214,6 +216,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new BillingDestination();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.BillingProto
           .internal_static_google_api_Billing_BillingDestination_descriptor;
@@ -287,8 +294,7 @@ public com.google.protobuf.ByteString getMonitoredResourceBytes() {
     public static final int METRICS_FIELD_NUMBER = 2;
 
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList metrics_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList metrics_;
     /**
      *
      *
@@ -574,7 +580,8 @@ public Builder clear() {
         super.clear();
         bitField0_ = 0;
         monitoredResource_ = "";
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -602,6 +609,7 @@ public com.google.api.Billing.BillingDestination build() {
       public com.google.api.Billing.BillingDestination buildPartial() {
         com.google.api.Billing.BillingDestination result =
             new com.google.api.Billing.BillingDestination(this);
+        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) {
           buildPartial0(result);
         }
@@ -609,15 +617,54 @@ public com.google.api.Billing.BillingDestination buildPartial() {
         return result;
       }
 
+      private void buildPartialRepeatedFields(com.google.api.Billing.BillingDestination result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.metrics_ = metrics_;
+      }
+
       private void buildPartial0(com.google.api.Billing.BillingDestination result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.monitoredResource_ = monitoredResource_;
         }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          metrics_.makeImmutable();
-          result.metrics_ = metrics_;
-        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -640,7 +687,7 @@ public Builder mergeFrom(com.google.api.Billing.BillingDestination other) {
         if (!other.metrics_.isEmpty()) {
           if (metrics_.isEmpty()) {
             metrics_ = other.metrics_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -821,14 +868,14 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList metrics_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      private com.google.protobuf.LazyStringList metrics_ =
+          com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureMetricsIsMutable() {
-        if (!metrics_.isModifiable()) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           metrics_ = new com.google.protobuf.LazyStringArrayList(metrics_);
+          bitField0_ |= 0x00000002;
         }
-        bitField0_ |= 0x00000002;
       }
       /**
        *
@@ -844,8 +891,7 @@ private void ensureMetricsIsMutable() {
        * @return A list containing the metrics.
        */
       public com.google.protobuf.ProtocolStringList getMetricsList() {
-        metrics_.makeImmutable();
-        return metrics_;
+        return metrics_.getUnmodifiableView();
       }
       /**
        *
@@ -918,7 +964,6 @@ public Builder setMetrics(int index, java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -942,7 +987,6 @@ public Builder addMetrics(java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -963,7 +1007,6 @@ public Builder addMetrics(java.lang.String value) {
       public Builder addAllMetrics(java.lang.Iterable<java.lang.String> values) {
         ensureMetricsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, metrics_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -981,9 +1024,8 @@ public Builder addAllMetrics(java.lang.Iterable<java.lang.String> values) {
        * @return This builder for chaining.
        */
       public Builder clearMetrics() {
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        ;
         onChanged();
         return this;
       }
@@ -1008,7 +1050,6 @@ public Builder addMetricsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1329,15 +1370,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Billing related configuration of the service.
-   *
    * The following example shows how to configure monitored resources and metrics
    * for billing, `consumer_destinations` is the only supported destination and
    * the monitored resources need at least one label key
    * `cloud.googleapis.com/location` to indicate the location of the billing
    * usage, using different monitored resources between monitoring and billing is
    * recommended so they can be evolved independently:
-   *
-   *
    *     monitored_resources:
    *     - type: library.googleapis.com/billing_branch
    *       labels:
@@ -1447,6 +1485,39 @@ private void buildPartial0(com.google.api.Billing result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Billing) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettings.java
index 12400b691c..22e1d6a886 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettings.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ClientLibrarySettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_ClientLibrarySettings_descriptor;
   }
@@ -990,6 +995,39 @@ private void buildPartial0(com.google.api.ClientLibrarySettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ClientLibrarySettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java
index 8bdd110ef1..1a5e87bc39 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java
@@ -37,31 +37,23 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    *
    * <pre>
    * A definition of a client library method signature.
-   *
    * In client libraries, each proto RPC corresponds to one or more methods
    * which the end user is able to call, and calls the underlying RPC.
    * Normally, this method receives a single argument (a struct or instance
    * corresponding to the RPC request object). Defining this field will
    * add one or more overloads providing flattened or simpler method signatures
    * in some languages.
-   *
    * The fields on the method signature are provided as a comma-separated
    * string.
-   *
    * For example, the proto RPC and annotation:
-   *
    *   rpc CreateSubscription(CreateSubscriptionRequest)
    *       returns (Subscription) {
    *     option (google.api.method_signature) = "name,topic";
    *   }
-   *
    * Would add the following Java overload (in addition to the method accepting
    * the request object):
-   *
    *   public final Subscription createSubscription(String name, String topic)
-   *
    * The following backwards-compatibility guidelines apply:
-   *
    *   * Adding this annotation to an unannotated method is backwards
    *     compatible.
    *   * Adding this annotation to a method which already has existing
@@ -88,9 +80,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    * <pre>
    * The hostname for this service.
    * This should be specified with no prefix or protocol.
-   *
    * Example:
-   *
    *   service Foo {
    *     option (google.api.default_host) = "foo.googleapi.com";
    *     ...
@@ -111,19 +101,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    *
    * <pre>
    * OAuth scopes needed for the client.
-   *
    * Example:
-   *
    *   service Foo {
    *     option (google.api.oauth_scopes) = &#92;
    *       "https://www.googleapis.com/auth/cloud-platform";
    *     ...
    *   }
-   *
    * If there is more than one scope, use a comma-separated string:
-   *
    * Example:
-   *
    *   service Foo {
    *     option (google.api.oauth_scopes) = &#92;
    *       "https://www.googleapis.com/auth/cloud-platform,"
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java
index e2dc7ee3c4..cd775f9434 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CommonLanguageSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_CommonLanguageSettings_descriptor;
   }
@@ -494,6 +499,39 @@ private void buildPartial0(com.google.api.CommonLanguageSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.CommonLanguageSettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
index f9c91ce5cf..2d38026dd4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
@@ -24,7 +24,6 @@
  * <pre>
  * Output generated from semantically comparing two versions of a service
  * configuration.
- *
  * Includes detailed information about a field that have changed with
  * applicable advice about potential consequences for the change, such as
  * backwards-incompatibility.
@@ -56,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ConfigChange();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_descriptor;
   }
@@ -552,7 +556,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre>
    * Output generated from semantically comparing two versions of a service
    * configuration.
-   *
    * Includes detailed information about a field that have changed with
    * applicable advice about potential consequences for the change, such as
    * backwards-incompatibility.
@@ -660,6 +663,39 @@ private void buildPartial0(com.google.api.ConfigChange result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ConfigChange) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Context.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Context.java
index 80f9bb90f5..f3f2c60cf3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Context.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Context.java
@@ -23,31 +23,24 @@
  *
  * <pre>
  * `Context` defines which contexts an API requests.
- *
  * Example:
- *
  *     context:
  *       rules:
  *       - selector: "*"
  *         requested:
  *         - google.rpc.context.ProjectContext
  *         - google.rpc.context.OriginContext
- *
  * The above specifies that all methods in the API request
  * `google.rpc.context.ProjectContext` and
  * `google.rpc.context.OriginContext`.
- *
  * Available context types are defined in package
  * `google.rpc.context`.
- *
  * This also provides mechanism to allowlist any protobuf message extension that
  * can be sent in grpc metadata using “x-goog-ext-&lt;extension_id&gt;-bin” and
  * “x-goog-ext-&lt;extension_id&gt;-jspb” format. For example, list any service
  * specific protobuf types that can appear in grpc metadata as follows in your
  * yaml file:
- *
  * Example:
- *
  *     context:
  *       rules:
  *        - selector: "google.example.library.v1.LibraryService.CreateBook"
@@ -55,7 +48,6 @@
  *          - google.foo.v1.NewExtension
  *          allowed_response_extensions:
  *          - google.foo.v1.NewExtension
- *
  * You can also specify extension ID instead of fully qualified extension name
  * here.
  * </pre>
@@ -82,6 +74,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Context();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ContextProto.internal_static_google_api_Context_descriptor;
   }
@@ -103,7 +100,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -118,7 +114,6 @@ public java.util.List<com.google.api.ContextRule> getRulesList() {
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -133,7 +128,6 @@ public java.util.List<? extends com.google.api.ContextRuleOrBuilder> getRulesOrB
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -148,7 +142,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -163,7 +156,6 @@ public com.google.api.ContextRule getRules(int index) {
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -338,31 +330,24 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * `Context` defines which contexts an API requests.
-   *
    * Example:
-   *
    *     context:
    *       rules:
    *       - selector: "*"
    *         requested:
    *         - google.rpc.context.ProjectContext
    *         - google.rpc.context.OriginContext
-   *
    * The above specifies that all methods in the API request
    * `google.rpc.context.ProjectContext` and
    * `google.rpc.context.OriginContext`.
-   *
    * Available context types are defined in package
    * `google.rpc.context`.
-   *
    * This also provides mechanism to allowlist any protobuf message extension that
    * can be sent in grpc metadata using “x-goog-ext-&lt;extension_id&gt;-bin” and
    * “x-goog-ext-&lt;extension_id&gt;-jspb” format. For example, list any service
    * specific protobuf types that can appear in grpc metadata as follows in your
    * yaml file:
-   *
    * Example:
-   *
    *     context:
    *       rules:
    *        - selector: "google.example.library.v1.LibraryService.CreateBook"
@@ -370,7 +355,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *          - google.foo.v1.NewExtension
    *          allowed_response_extensions:
    *          - google.foo.v1.NewExtension
-   *
    * You can also specify extension ID instead of fully qualified extension name
    * here.
    * </pre>
@@ -460,6 +444,39 @@ private void buildPartial0(com.google.api.Context result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Context) {
@@ -576,7 +593,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -594,7 +610,6 @@ public java.util.List<com.google.api.ContextRule> getRulesList() {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -612,7 +627,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -630,7 +644,6 @@ public com.google.api.ContextRule getRules(int index) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -654,7 +667,6 @@ public Builder setRules(int index, com.google.api.ContextRule value) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -675,7 +687,6 @@ public Builder setRules(int index, com.google.api.ContextRule.Builder builderFor
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -699,7 +710,6 @@ public Builder addRules(com.google.api.ContextRule value) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -723,7 +733,6 @@ public Builder addRules(int index, com.google.api.ContextRule value) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -744,7 +753,6 @@ public Builder addRules(com.google.api.ContextRule.Builder builderForValue) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -765,7 +773,6 @@ public Builder addRules(int index, com.google.api.ContextRule.Builder builderFor
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -786,7 +793,6 @@ public Builder addAllRules(java.lang.Iterable<? extends com.google.api.ContextRu
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -807,7 +813,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -828,7 +833,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -842,7 +846,6 @@ public com.google.api.ContextRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -860,7 +863,6 @@ public com.google.api.ContextRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -878,7 +880,6 @@ public java.util.List<? extends com.google.api.ContextRuleOrBuilder> getRulesOrB
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -892,7 +893,6 @@ public com.google.api.ContextRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -907,7 +907,6 @@ public com.google.api.ContextRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextOrBuilder.java
index 8a776db816..f7018ada23 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextOrBuilder.java
@@ -28,7 +28,6 @@ public interface ContextOrBuilder
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -40,7 +39,6 @@ public interface ContextOrBuilder
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -52,7 +50,6 @@ public interface ContextOrBuilder
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -64,7 +61,6 @@ public interface ContextOrBuilder
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -76,7 +72,6 @@ public interface ContextOrBuilder
    *
    * <pre>
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
index c03d4701c2..de05105937 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
@@ -40,10 +40,10 @@ private ContextRule(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
 
   private ContextRule() {
     selector_ = "";
-    requested_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    provided_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    requested_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -52,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ContextRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ContextProto.internal_static_google_api_ContextRule_descriptor;
   }
@@ -73,7 +78,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -99,7 +103,6 @@ public java.lang.String getSelector() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -124,8 +127,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   public static final int REQUESTED_FIELD_NUMBER = 2;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList requested_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList requested_;
   /**
    *
    *
@@ -188,8 +190,7 @@ public com.google.protobuf.ByteString getRequestedBytes(int index) {
   public static final int PROVIDED_FIELD_NUMBER = 3;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList provided_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList provided_;
   /**
    *
    *
@@ -252,8 +253,7 @@ public com.google.protobuf.ByteString getProvidedBytes(int index) {
   public static final int ALLOWED_REQUEST_EXTENSIONS_FIELD_NUMBER = 4;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList allowedRequestExtensions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList allowedRequestExtensions_;
   /**
    *
    *
@@ -320,8 +320,7 @@ public com.google.protobuf.ByteString getAllowedRequestExtensionsBytes(int index
   public static final int ALLOWED_RESPONSE_EXTENSIONS_FIELD_NUMBER = 5;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList allowedResponseExtensions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList allowedResponseExtensions_;
   /**
    *
    *
@@ -648,10 +647,14 @@ public Builder clear() {
       super.clear();
       bitField0_ = 0;
       selector_ = "";
-      requested_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      provided_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      requested_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
@@ -677,6 +680,7 @@ public com.google.api.ContextRule build() {
     @java.lang.Override
     public com.google.api.ContextRule buildPartial() {
       com.google.api.ContextRule result = new com.google.api.ContextRule(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -684,29 +688,69 @@ public com.google.api.ContextRule buildPartial() {
       return result;
     }
 
-    private void buildPartial0(com.google.api.ContextRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
+    private void buildPartialRepeatedFields(com.google.api.ContextRule result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        requested_ = requested_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        requested_.makeImmutable();
-        result.requested_ = requested_;
+      result.requested_ = requested_;
+      if (((bitField0_ & 0x00000004) != 0)) {
+        provided_ = provided_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        provided_.makeImmutable();
-        result.provided_ = provided_;
+      result.provided_ = provided_;
+      if (((bitField0_ & 0x00000008) != 0)) {
+        allowedRequestExtensions_ = allowedRequestExtensions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        allowedRequestExtensions_.makeImmutable();
-        result.allowedRequestExtensions_ = allowedRequestExtensions_;
+      result.allowedRequestExtensions_ = allowedRequestExtensions_;
+      if (((bitField0_ & 0x00000010) != 0)) {
+        allowedResponseExtensions_ = allowedResponseExtensions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000010);
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        allowedResponseExtensions_.makeImmutable();
-        result.allowedResponseExtensions_ = allowedResponseExtensions_;
+      result.allowedResponseExtensions_ = allowedResponseExtensions_;
+    }
+
+    private void buildPartial0(com.google.api.ContextRule result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.selector_ = selector_;
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ContextRule) {
@@ -727,7 +771,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.requested_.isEmpty()) {
         if (requested_.isEmpty()) {
           requested_ = other.requested_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureRequestedIsMutable();
           requested_.addAll(other.requested_);
@@ -737,7 +781,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.provided_.isEmpty()) {
         if (provided_.isEmpty()) {
           provided_ = other.provided_;
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureProvidedIsMutable();
           provided_.addAll(other.provided_);
@@ -747,7 +791,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.allowedRequestExtensions_.isEmpty()) {
         if (allowedRequestExtensions_.isEmpty()) {
           allowedRequestExtensions_ = other.allowedRequestExtensions_;
-          bitField0_ |= 0x00000008;
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureAllowedRequestExtensionsIsMutable();
           allowedRequestExtensions_.addAll(other.allowedRequestExtensions_);
@@ -757,7 +801,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.allowedResponseExtensions_.isEmpty()) {
         if (allowedResponseExtensions_.isEmpty()) {
           allowedResponseExtensions_ = other.allowedResponseExtensions_;
-          bitField0_ |= 0x00000010;
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           ensureAllowedResponseExtensionsIsMutable();
           allowedResponseExtensions_.addAll(other.allowedResponseExtensions_);
@@ -849,7 +893,6 @@ public Builder mergeFrom(
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -874,7 +917,6 @@ public java.lang.String getSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -899,7 +941,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -923,7 +964,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -943,7 +983,6 @@ public Builder clearSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -964,14 +1003,14 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList requested_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList requested_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRequestedIsMutable() {
-      if (!requested_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         requested_ = new com.google.protobuf.LazyStringArrayList(requested_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000002;
     }
     /**
      *
@@ -985,8 +1024,7 @@ private void ensureRequestedIsMutable() {
      * @return A list containing the requested.
      */
     public com.google.protobuf.ProtocolStringList getRequestedList() {
-      requested_.makeImmutable();
-      return requested_;
+      return requested_.getUnmodifiableView();
     }
     /**
      *
@@ -1051,7 +1089,6 @@ public Builder setRequested(int index, java.lang.String value) {
       }
       ensureRequestedIsMutable();
       requested_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1073,7 +1110,6 @@ public Builder addRequested(java.lang.String value) {
       }
       ensureRequestedIsMutable();
       requested_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1092,7 +1128,6 @@ public Builder addRequested(java.lang.String value) {
     public Builder addAllRequested(java.lang.Iterable<java.lang.String> values) {
       ensureRequestedIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, requested_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1108,9 +1143,8 @@ public Builder addAllRequested(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearRequested() {
-      requested_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      requested_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      ;
       onChanged();
       return this;
     }
@@ -1133,19 +1167,18 @@ public Builder addRequestedBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRequestedIsMutable();
       requested_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList provided_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList provided_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureProvidedIsMutable() {
-      if (!provided_.isModifiable()) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         provided_ = new com.google.protobuf.LazyStringArrayList(provided_);
+        bitField0_ |= 0x00000004;
       }
-      bitField0_ |= 0x00000004;
     }
     /**
      *
@@ -1159,8 +1192,7 @@ private void ensureProvidedIsMutable() {
      * @return A list containing the provided.
      */
     public com.google.protobuf.ProtocolStringList getProvidedList() {
-      provided_.makeImmutable();
-      return provided_;
+      return provided_.getUnmodifiableView();
     }
     /**
      *
@@ -1225,7 +1257,6 @@ public Builder setProvided(int index, java.lang.String value) {
       }
       ensureProvidedIsMutable();
       provided_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1247,7 +1278,6 @@ public Builder addProvided(java.lang.String value) {
       }
       ensureProvidedIsMutable();
       provided_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1266,7 +1296,6 @@ public Builder addProvided(java.lang.String value) {
     public Builder addAllProvided(java.lang.Iterable<java.lang.String> values) {
       ensureProvidedIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, provided_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1282,9 +1311,8 @@ public Builder addAllProvided(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearProvided() {
-      provided_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000004);
-      ;
       onChanged();
       return this;
     }
@@ -1307,20 +1335,19 @@ public Builder addProvidedBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureProvidedIsMutable();
       provided_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList allowedRequestExtensions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList allowedRequestExtensions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAllowedRequestExtensionsIsMutable() {
-      if (!allowedRequestExtensions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         allowedRequestExtensions_ =
             new com.google.protobuf.LazyStringArrayList(allowedRequestExtensions_);
+        bitField0_ |= 0x00000008;
       }
-      bitField0_ |= 0x00000008;
     }
     /**
      *
@@ -1335,8 +1362,7 @@ private void ensureAllowedRequestExtensionsIsMutable() {
      * @return A list containing the allowedRequestExtensions.
      */
     public com.google.protobuf.ProtocolStringList getAllowedRequestExtensionsList() {
-      allowedRequestExtensions_.makeImmutable();
-      return allowedRequestExtensions_;
+      return allowedRequestExtensions_.getUnmodifiableView();
     }
     /**
      *
@@ -1405,7 +1431,6 @@ public Builder setAllowedRequestExtensions(int index, java.lang.String value) {
       }
       ensureAllowedRequestExtensionsIsMutable();
       allowedRequestExtensions_.set(index, value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1428,7 +1453,6 @@ public Builder addAllowedRequestExtensions(java.lang.String value) {
       }
       ensureAllowedRequestExtensionsIsMutable();
       allowedRequestExtensions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1448,7 +1472,6 @@ public Builder addAllowedRequestExtensions(java.lang.String value) {
     public Builder addAllAllowedRequestExtensions(java.lang.Iterable<java.lang.String> values) {
       ensureAllowedRequestExtensionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, allowedRequestExtensions_);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1465,9 +1488,8 @@ public Builder addAllAllowedRequestExtensions(java.lang.Iterable<java.lang.Strin
      * @return This builder for chaining.
      */
     public Builder clearAllowedRequestExtensions() {
-      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000008);
-      ;
       onChanged();
       return this;
     }
@@ -1491,20 +1513,19 @@ public Builder addAllowedRequestExtensionsBytes(com.google.protobuf.ByteString v
       checkByteStringIsUtf8(value);
       ensureAllowedRequestExtensionsIsMutable();
       allowedRequestExtensions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList allowedResponseExtensions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList allowedResponseExtensions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAllowedResponseExtensionsIsMutable() {
-      if (!allowedResponseExtensions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         allowedResponseExtensions_ =
             new com.google.protobuf.LazyStringArrayList(allowedResponseExtensions_);
+        bitField0_ |= 0x00000010;
       }
-      bitField0_ |= 0x00000010;
     }
     /**
      *
@@ -1519,8 +1540,7 @@ private void ensureAllowedResponseExtensionsIsMutable() {
      * @return A list containing the allowedResponseExtensions.
      */
     public com.google.protobuf.ProtocolStringList getAllowedResponseExtensionsList() {
-      allowedResponseExtensions_.makeImmutable();
-      return allowedResponseExtensions_;
+      return allowedResponseExtensions_.getUnmodifiableView();
     }
     /**
      *
@@ -1589,7 +1609,6 @@ public Builder setAllowedResponseExtensions(int index, java.lang.String value) {
       }
       ensureAllowedResponseExtensionsIsMutable();
       allowedResponseExtensions_.set(index, value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1612,7 +1631,6 @@ public Builder addAllowedResponseExtensions(java.lang.String value) {
       }
       ensureAllowedResponseExtensionsIsMutable();
       allowedResponseExtensions_.add(value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1632,7 +1650,6 @@ public Builder addAllowedResponseExtensions(java.lang.String value) {
     public Builder addAllAllowedResponseExtensions(java.lang.Iterable<java.lang.String> values) {
       ensureAllowedResponseExtensionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, allowedResponseExtensions_);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1649,9 +1666,8 @@ public Builder addAllAllowedResponseExtensions(java.lang.Iterable<java.lang.Stri
      * @return This builder for chaining.
      */
     public Builder clearAllowedResponseExtensions() {
-      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000010);
-      ;
       onChanged();
       return this;
     }
@@ -1675,7 +1691,6 @@ public Builder addAllowedResponseExtensionsBytes(com.google.protobuf.ByteString
       checkByteStringIsUtf8(value);
       ensureAllowedResponseExtensionsIsMutable();
       allowedResponseExtensions_.add(value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRuleOrBuilder.java
index e45c5edf07..d6c720cd07 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextRuleOrBuilder.java
@@ -28,7 +28,6 @@ public interface ContextRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -43,7 +42,6 @@ public interface ContextRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Control.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Control.java
index f5df4104e1..2a4452abc3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Control.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Control.java
@@ -23,9 +23,7 @@
  *
  * <pre>
  * Selects and configures the service controller used by the service.
- *
  * Example:
- *
  *     control:
  *       environment: servicecontrol.googleapis.com
  * </pre>
@@ -52,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Control();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ControlProto.internal_static_google_api_Control_descriptor;
   }
@@ -281,9 +284,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Selects and configures the service controller used by the service.
-   *
    * Example:
-   *
    *     control:
    *       environment: servicecontrol.googleapis.com
    * </pre>
@@ -357,6 +358,39 @@ private void buildPartial0(com.google.api.Control result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Control) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettings.java
index 3c42bd0e64..9559091e0e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettings.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CppSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_CppSettings_descriptor;
   }
@@ -345,6 +350,39 @@ private void buildPartial0(com.google.api.CppSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.CppSettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
index 8e0a2d471a..9d1518d10d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CustomHttpPattern();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_descriptor;
   }
@@ -410,6 +415,39 @@ private void buildPartial0(com.google.api.CustomHttpPattern result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.CustomHttpPattern) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
index 7dc4ce7a0a..14f77f78a9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
@@ -25,14 +25,12 @@
  * `Distribution` contains summary statistics for a population of values. It
  * optionally contains a histogram representing the distribution of those values
  * across a set of buckets.
- *
  * The summary statistics are the count, mean, sum of the squared deviation from
  * the mean, the minimum, and the maximum of the set of population of values.
  * The histogram is based on a sequence of buckets and gives a count of values
  * that fall into each bucket. The boundaries of the buckets are given either
  * explicitly or by formulas for buckets of fixed or exponentially increasing
  * widths.
- *
  * Although it is not forbidden, it is generally a bad idea to include
  * non-finite values (infinities or NaNs) in the population of values, as this
  * will render the `mean` and `sum_of_squared_deviation` fields meaningless.
@@ -61,6 +59,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Distribution();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DistributionProto.internal_static_google_api_Distribution_descriptor;
   }
@@ -132,6 +135,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Range();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.DistributionProto
           .internal_static_google_api_Distribution_Range_descriptor;
@@ -441,6 +449,41 @@ private void buildPartial0(com.google.api.Distribution.Range result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Distribution.Range) {
@@ -796,7 +839,7 @@ public interface BucketOptionsOrBuilder
      */
     com.google.api.Distribution.BucketOptions.ExplicitOrBuilder getExplicitBucketsOrBuilder();
 
-    com.google.api.Distribution.BucketOptions.OptionsCase getOptionsCase();
+    public com.google.api.Distribution.BucketOptions.OptionsCase getOptionsCase();
   }
   /**
    *
@@ -806,7 +849,6 @@ public interface BucketOptionsOrBuilder
    * for the distribution. The buckets can be in a linear sequence, an
    * exponential sequence, or each bucket can be specified explicitly.
    * `BucketOptions` does not include the number of values in each bucket.
-   *
    * A bucket has an inclusive lower bound and exclusive upper bound for the
    * values that are counted for that bucket. The upper bound of a bucket must
    * be strictly greater than the lower bound. The sequence of N buckets for a
@@ -839,6 +881,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new BucketOptions();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.DistributionProto
           .internal_static_google_api_Distribution_BucketOptions_descriptor;
@@ -905,12 +952,9 @@ public interface LinearOrBuilder
      * Specifies a linear sequence of buckets that all have the same width
      * (except overflow and underflow). Each bucket represents a constant
      * absolute uncertainty on the specific value in the bucket.
-     *
      * There are `num_finite_buckets + 2` (= N) buckets. Bucket `i` has the
      * following boundaries:
-     *
      *    Upper bound (0 &lt;= i &lt; N-1):     offset + (width * i).
-     *
      *    Lower bound (1 &lt;= i &lt; N):       offset + (width * (i - 1)).
      * </pre>
      *
@@ -934,6 +978,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Linear();
       }
 
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+        return this.unknownFields;
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.api.DistributionProto
             .internal_static_google_api_Distribution_BucketOptions_Linear_descriptor;
@@ -1196,12 +1245,9 @@ protected Builder newBuilderForType(
        * Specifies a linear sequence of buckets that all have the same width
        * (except overflow and underflow). Each bucket represents a constant
        * absolute uncertainty on the specific value in the bucket.
-       *
        * There are `num_finite_buckets + 2` (= N) buckets. Bucket `i` has the
        * following boundaries:
-       *
        *    Upper bound (0 &lt;= i &lt; N-1):     offset + (width * i).
-       *
        *    Lower bound (1 &lt;= i &lt; N):       offset + (width * (i - 1)).
        * </pre>
        *
@@ -1288,6 +1334,41 @@ private void buildPartial0(com.google.api.Distribution.BucketOptions.Linear resu
           }
         }
 
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.api.Distribution.BucketOptions.Linear) {
@@ -1647,12 +1728,9 @@ public interface ExponentialOrBuilder
      * Specifies an exponential sequence of buckets that have a width that is
      * proportional to the value of the lower bound. Each bucket represents a
      * constant relative uncertainty on a specific value in the bucket.
-     *
      * There are `num_finite_buckets + 2` (= N) buckets. Bucket `i` has the
      * following boundaries:
-     *
      *    Upper bound (0 &lt;= i &lt; N-1):     scale * (growth_factor ^ i).
-     *
      *    Lower bound (1 &lt;= i &lt; N):       scale * (growth_factor ^ (i - 1)).
      * </pre>
      *
@@ -1676,6 +1754,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Exponential();
       }
 
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+        return this.unknownFields;
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.api.DistributionProto
             .internal_static_google_api_Distribution_BucketOptions_Exponential_descriptor;
@@ -1939,12 +2022,9 @@ protected Builder newBuilderForType(
        * Specifies an exponential sequence of buckets that have a width that is
        * proportional to the value of the lower bound. Each bucket represents a
        * constant relative uncertainty on a specific value in the bucket.
-       *
        * There are `num_finite_buckets + 2` (= N) buckets. Bucket `i` has the
        * following boundaries:
-       *
        *    Upper bound (0 &lt;= i &lt; N-1):     scale * (growth_factor ^ i).
-       *
        *    Lower bound (1 &lt;= i &lt; N):       scale * (growth_factor ^ (i - 1)).
        * </pre>
        *
@@ -2031,6 +2111,41 @@ private void buildPartial0(com.google.api.Distribution.BucketOptions.Exponential
           }
         }
 
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.api.Distribution.BucketOptions.Exponential) {
@@ -2387,13 +2502,10 @@ public interface ExplicitOrBuilder
      *
      * <pre>
      * Specifies a set of buckets with arbitrary widths.
-     *
      * There are `size(bounds) + 1` (= N) buckets. Bucket `i` has the following
      * boundaries:
-     *
      *    Upper bound (0 &lt;= i &lt; N-1):     bounds[i]
      *    Lower bound (1 &lt;= i &lt; N);       bounds[i - 1]
-     *
      * The `bounds` field must contain at least one element. If `bounds` has
      * only one element, then there are no finite buckets, and that single
      * element is the common boundary of the overflow and underflow buckets.
@@ -2421,6 +2533,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Explicit();
       }
 
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+        return this.unknownFields;
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.api.DistributionProto
             .internal_static_google_api_Distribution_BucketOptions_Explicit_descriptor;
@@ -2667,13 +2784,10 @@ protected Builder newBuilderForType(
        *
        * <pre>
        * Specifies a set of buckets with arbitrary widths.
-       *
        * There are `size(bounds) + 1` (= N) buckets. Bucket `i` has the following
        * boundaries:
-       *
        *    Upper bound (0 &lt;= i &lt; N-1):     bounds[i]
        *    Lower bound (1 &lt;= i &lt; N);       bounds[i - 1]
-       *
        * The `bounds` field must contain at least one element. If `bounds` has
        * only one element, then there are no finite buckets, and that single
        * element is the common boundary of the overflow and underflow buckets.
@@ -2761,6 +2875,41 @@ private void buildPartial0(com.google.api.Distribution.BucketOptions.Explicit re
           int from_bitField0_ = bitField0_;
         }
 
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.api.Distribution.BucketOptions.Explicit) {
@@ -3040,8 +3189,6 @@ public com.google.api.Distribution.BucketOptions.Explicit getDefaultInstanceForT
     }
 
     private int optionsCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object options_;
 
     public enum OptionsCase
@@ -3459,7 +3606,6 @@ protected Builder newBuilderForType(
      * for the distribution. The buckets can be in a linear sequence, an
      * exponential sequence, or each bucket can be specified explicitly.
      * `BucketOptions` does not include the number of values in each bucket.
-     *
      * A bucket has an inclusive lower bound and exclusive upper bound for the
      * values that are counted for that bucket. The upper bound of a bucket must
      * be strictly greater than the lower bound. The sequence of N buckets for a
@@ -3569,6 +3715,41 @@ private void buildPartialOneofs(com.google.api.Distribution.BucketOptions result
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Distribution.BucketOptions) {
@@ -4441,14 +4622,10 @@ public interface ExemplarOrBuilder
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4461,14 +4638,10 @@ public interface ExemplarOrBuilder
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4481,14 +4654,10 @@ public interface ExemplarOrBuilder
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4501,14 +4670,10 @@ public interface ExemplarOrBuilder
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4521,14 +4686,10 @@ public interface ExemplarOrBuilder
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4570,6 +4731,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Exemplar();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.DistributionProto
           .internal_static_google_api_Distribution_Exemplar_descriptor;
@@ -4659,14 +4825,10 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4682,14 +4844,10 @@ public java.util.List<com.google.protobuf.Any> getAttachmentsList() {
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4706,14 +4864,10 @@ public java.util.List<com.google.protobuf.Any> getAttachmentsList() {
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4729,14 +4883,10 @@ public int getAttachmentsCount() {
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -4752,14 +4902,10 @@ public com.google.protobuf.Any getAttachments(int index) {
      *
      * <pre>
      * Contextual information about the example value. Examples are:
-     *
      *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-     *
      *   Literal string: type.googleapis.com/google.protobuf.StringValue
-     *
      *   Labels dropped during aggregation:
      *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-     *
      * There may be only a single attachment of any given message type in a
      * single exemplar, and this is enforced by the system.
      * </pre>
@@ -5073,6 +5219,41 @@ private void buildPartial0(com.google.api.Distribution.Exemplar result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.Distribution.Exemplar) {
@@ -5447,14 +5628,10 @@ private void ensureAttachmentsIsMutable() {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5473,14 +5650,10 @@ public java.util.List<com.google.protobuf.Any> getAttachmentsList() {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5499,14 +5672,10 @@ public int getAttachmentsCount() {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5525,14 +5694,10 @@ public com.google.protobuf.Any getAttachments(int index) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5557,14 +5722,10 @@ public Builder setAttachments(int index, com.google.protobuf.Any value) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5586,14 +5747,10 @@ public Builder setAttachments(int index, com.google.protobuf.Any.Builder builder
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5618,14 +5775,10 @@ public Builder addAttachments(com.google.protobuf.Any value) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5650,14 +5803,10 @@ public Builder addAttachments(int index, com.google.protobuf.Any value) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5679,14 +5828,10 @@ public Builder addAttachments(com.google.protobuf.Any.Builder builderForValue) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5708,14 +5853,10 @@ public Builder addAttachments(int index, com.google.protobuf.Any.Builder builder
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5738,14 +5879,10 @@ public Builder addAllAttachments(
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5767,14 +5904,10 @@ public Builder clearAttachments() {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5796,14 +5929,10 @@ public Builder removeAttachments(int index) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5818,14 +5947,10 @@ public com.google.protobuf.Any.Builder getAttachmentsBuilder(int index) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5844,14 +5969,10 @@ public com.google.protobuf.AnyOrBuilder getAttachmentsOrBuilder(int index) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5871,14 +5992,10 @@ public com.google.protobuf.AnyOrBuilder getAttachmentsOrBuilder(int index) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5894,14 +6011,10 @@ public com.google.protobuf.Any.Builder addAttachmentsBuilder() {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -5917,14 +6030,10 @@ public com.google.protobuf.Any.Builder addAttachmentsBuilder(int index) {
        *
        * <pre>
        * Contextual information about the example value. Examples are:
-       *
        *   Trace: type.googleapis.com/google.monitoring.v3.SpanContext
-       *
        *   Literal string: type.googleapis.com/google.protobuf.StringValue
-       *
        *   Labels dropped during aggregation:
        *     type.googleapis.com/google.monitoring.v3.DroppedLabels
-       *
        * There may be only a single attachment of any given message type in a
        * single exemplar, and this is enforced by the system.
        * </pre>
@@ -6066,12 +6175,9 @@ public double getMean() {
    * <pre>
    * The sum of squared deviations from the mean of the values in the
    * population. For values x_i this is:
-   *
    *     Sum[i=1..n]((x_i - mean)^2)
-   *
    * Knuth, "The Art of Computer Programming", Vol. 2, page 232, 3rd edition
    * describes Welford's method for accumulating this sum in one pass.
-   *
    * If `count` is zero then this field must be zero.
    * </pre>
    *
@@ -6199,11 +6305,9 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil
    * this field. If there is a histogram, then the sum of the values in
    * `bucket_counts` must equal the value in the `count` field of the
    * distribution.
-   *
    * If present, `bucket_counts` should contain N values, where N is the number
    * of buckets specified in `bucket_options`. If you supply fewer than N
    * values, the remaining values are assumed to be 0.
-   *
    * The order of the values in `bucket_counts` follows the bucket numbering
    * schemes described for the three bucket types. The first value must be the
    * count for the underflow bucket (number 0). The next N-2 values are the
@@ -6228,11 +6332,9 @@ public java.util.List<java.lang.Long> getBucketCountsList() {
    * this field. If there is a histogram, then the sum of the values in
    * `bucket_counts` must equal the value in the `count` field of the
    * distribution.
-   *
    * If present, `bucket_counts` should contain N values, where N is the number
    * of buckets specified in `bucket_options`. If you supply fewer than N
    * values, the remaining values are assumed to be 0.
-   *
    * The order of the values in `bucket_counts` follows the bucket numbering
    * schemes described for the three bucket types. The first value must be the
    * count for the underflow bucket (number 0). The next N-2 values are the
@@ -6256,11 +6358,9 @@ public int getBucketCountsCount() {
    * this field. If there is a histogram, then the sum of the values in
    * `bucket_counts` must equal the value in the `count` field of the
    * distribution.
-   *
    * If present, `bucket_counts` should contain N values, where N is the number
    * of buckets specified in `bucket_options`. If you supply fewer than N
    * values, the remaining values are assumed to be 0.
-   *
    * The order of the values in `bucket_counts` follows the bucket numbering
    * schemes described for the three bucket types. The first value must be the
    * count for the underflow bucket (number 0). The next N-2 values are the
@@ -6604,14 +6704,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * `Distribution` contains summary statistics for a population of values. It
    * optionally contains a histogram representing the distribution of those values
    * across a set of buckets.
-   *
    * The summary statistics are the count, mean, sum of the squared deviation from
    * the mean, the minimum, and the maximum of the set of population of values.
    * The histogram is based on a sequence of buckets and gives a count of values
    * that fall into each bucket. The boundaries of the buckets are given either
    * explicitly or by formulas for buckets of fixed or exponentially increasing
    * widths.
-   *
    * Although it is not forbidden, it is generally a bad idea to include
    * non-finite values (infinities or NaNs) in the population of values, as this
    * will render the `mean` and `sum_of_squared_deviation` fields meaningless.
@@ -6738,6 +6836,39 @@ private void buildPartial0(com.google.api.Distribution result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Distribution) {
@@ -7030,12 +7161,9 @@ public Builder clearMean() {
      * <pre>
      * The sum of squared deviations from the mean of the values in the
      * population. For values x_i this is:
-     *
      *     Sum[i=1..n]((x_i - mean)^2)
-     *
      * Knuth, "The Art of Computer Programming", Vol. 2, page 232, 3rd edition
      * describes Welford's method for accumulating this sum in one pass.
-     *
      * If `count` is zero then this field must be zero.
      * </pre>
      *
@@ -7053,12 +7181,9 @@ public double getSumOfSquaredDeviation() {
      * <pre>
      * The sum of squared deviations from the mean of the values in the
      * population. For values x_i this is:
-     *
      *     Sum[i=1..n]((x_i - mean)^2)
-     *
      * Knuth, "The Art of Computer Programming", Vol. 2, page 232, 3rd edition
      * describes Welford's method for accumulating this sum in one pass.
-     *
      * If `count` is zero then this field must be zero.
      * </pre>
      *
@@ -7080,12 +7205,9 @@ public Builder setSumOfSquaredDeviation(double value) {
      * <pre>
      * The sum of squared deviations from the mean of the values in the
      * population. For values x_i this is:
-     *
      *     Sum[i=1..n]((x_i - mean)^2)
-     *
      * Knuth, "The Art of Computer Programming", Vol. 2, page 232, 3rd edition
      * describes Welford's method for accumulating this sum in one pass.
-     *
      * If `count` is zero then this field must be zero.
      * </pre>
      *
@@ -7498,11 +7620,9 @@ private void ensureBucketCountsIsMutable() {
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
@@ -7528,11 +7648,9 @@ public java.util.List<java.lang.Long> getBucketCountsList() {
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
@@ -7556,11 +7674,9 @@ public int getBucketCountsCount() {
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
@@ -7585,11 +7701,9 @@ public long getBucketCounts(int index) {
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
@@ -7619,11 +7733,9 @@ public Builder setBucketCounts(int index, long value) {
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
@@ -7652,11 +7764,9 @@ public Builder addBucketCounts(long value) {
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
@@ -7684,11 +7794,9 @@ public Builder addAllBucketCounts(java.lang.Iterable<? extends java.lang.Long> v
      * this field. If there is a histogram, then the sum of the values in
      * `bucket_counts` must equal the value in the `count` field of the
      * distribution.
-     *
      * If present, `bucket_counts` should contain N values, where N is the number
      * of buckets specified in `bucket_options`. If you supply fewer than N
      * values, the remaining values are assumed to be 0.
-     *
      * The order of the values in `bucket_counts` follows the bucket numbering
      * schemes described for the three bucket types. The first value must be the
      * count for the underflow bucket (number 0). The next N-2 values are the
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionOrBuilder.java
index 1b6d60c622..27f3411ae3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionOrBuilder.java
@@ -58,12 +58,9 @@ public interface DistributionOrBuilder
    * <pre>
    * The sum of squared deviations from the mean of the values in the
    * population. For values x_i this is:
-   *
    *     Sum[i=1..n]((x_i - mean)^2)
-   *
    * Knuth, "The Art of Computer Programming", Vol. 2, page 232, 3rd edition
    * describes Welford's method for accumulating this sum in one pass.
-   *
    * If `count` is zero then this field must be zero.
    * </pre>
    *
@@ -158,11 +155,9 @@ public interface DistributionOrBuilder
    * this field. If there is a histogram, then the sum of the values in
    * `bucket_counts` must equal the value in the `count` field of the
    * distribution.
-   *
    * If present, `bucket_counts` should contain N values, where N is the number
    * of buckets specified in `bucket_options`. If you supply fewer than N
    * values, the remaining values are assumed to be 0.
-   *
    * The order of the values in `bucket_counts` follows the bucket numbering
    * schemes described for the three bucket types. The first value must be the
    * count for the underflow bucket (number 0). The next N-2 values are the
@@ -184,11 +179,9 @@ public interface DistributionOrBuilder
    * this field. If there is a histogram, then the sum of the values in
    * `bucket_counts` must equal the value in the `count` field of the
    * distribution.
-   *
    * If present, `bucket_counts` should contain N values, where N is the number
    * of buckets specified in `bucket_options`. If you supply fewer than N
    * values, the remaining values are assumed to be 0.
-   *
    * The order of the values in `bucket_counts` follows the bucket numbering
    * schemes described for the three bucket types. The first value must be the
    * count for the underflow bucket (number 0). The next N-2 values are the
@@ -210,11 +203,9 @@ public interface DistributionOrBuilder
    * this field. If there is a histogram, then the sum of the values in
    * `bucket_counts` must equal the value in the `count` field of the
    * distribution.
-   *
    * If present, `bucket_counts` should contain N values, where N is the number
    * of buckets specified in `bucket_options`. If you supply fewer than N
    * values, the remaining values are assumed to be 0.
-   *
    * The order of the values in `bucket_counts` follows the bucket numbering
    * schemes described for the three bucket types. The first value must be the
    * count for the underflow bucket (number 0). The next N-2 values are the
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
index 67836bc269..bb34d32e9e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
@@ -23,7 +23,6 @@
  *
  * <pre>
  * `Documentation` provides the information for describing a service.
- *
  * Example:
  * &lt;pre&gt;&lt;code&gt;documentation:
  *   summary: &gt;
@@ -50,14 +49,11 @@
  * code blocks are supported. Section headers can be provided and are
  * interpreted relative to the section nesting of the context where
  * a documentation fragment is embedded.
- *
  * Documentation from the IDL is merged with documentation defined
  * via the config at normalization time, where documentation provided
  * by config rules overrides IDL provided.
- *
  * A number of constructs specific to the API platform are supported
  * in documentation text.
- *
  * In order to reference a proto element, the following
  * notation can be used:
  * &lt;pre&gt;&lt;code&gt;&amp;#91;fully.qualified.proto.name]&amp;#91;]&lt;/code&gt;&lt;/pre&gt;
@@ -65,7 +61,6 @@
  * &lt;pre&gt;&lt;code&gt;&amp;#91;display text]&amp;#91;fully.qualified.proto.name]&lt;/code&gt;&lt;/pre&gt;
  * Text can be excluded from doc using the following notation:
  * &lt;pre&gt;&lt;code&gt;&amp;#40;-- internal comment --&amp;#41;&lt;/code&gt;&lt;/pre&gt;
- *
  * A few directives are available in documentation. Note that
  * directives must appear on a single line to be properly
  * identified. The `include` directive includes a markdown file from
@@ -106,6 +101,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Documentation();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DocumentationProto.internal_static_google_api_Documentation_descriptor;
   }
@@ -255,7 +255,6 @@ public com.google.api.PageOrBuilder getPagesOrBuilder(int index) {
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -270,7 +269,6 @@ public java.util.List<com.google.api.DocumentationRule> getRulesList() {
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -286,7 +284,6 @@ public java.util.List<com.google.api.DocumentationRule> getRulesList() {
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -301,7 +298,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -316,7 +312,6 @@ public com.google.api.DocumentationRule getRules(int index) {
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -721,7 +716,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * `Documentation` provides the information for describing a service.
-   *
    * Example:
    * &lt;pre&gt;&lt;code&gt;documentation:
    *   summary: &gt;
@@ -748,14 +742,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * code blocks are supported. Section headers can be provided and are
    * interpreted relative to the section nesting of the context where
    * a documentation fragment is embedded.
-   *
    * Documentation from the IDL is merged with documentation defined
    * via the config at normalization time, where documentation provided
    * by config rules overrides IDL provided.
-   *
    * A number of constructs specific to the API platform are supported
    * in documentation text.
-   *
    * In order to reference a proto element, the following
    * notation can be used:
    * &lt;pre&gt;&lt;code&gt;&amp;#91;fully.qualified.proto.name]&amp;#91;]&lt;/code&gt;&lt;/pre&gt;
@@ -763,7 +754,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * &lt;pre&gt;&lt;code&gt;&amp;#91;display text]&amp;#91;fully.qualified.proto.name]&lt;/code&gt;&lt;/pre&gt;
    * Text can be excluded from doc using the following notation:
    * &lt;pre&gt;&lt;code&gt;&amp;#40;-- internal comment --&amp;#41;&lt;/code&gt;&lt;/pre&gt;
-   *
    * A few directives are available in documentation. Note that
    * directives must appear on a single line to be properly
    * identified. The `include` directive includes a markdown file from
@@ -895,6 +885,39 @@ private void buildPartial0(com.google.api.Documentation result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Documentation) {
@@ -1551,7 +1574,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1569,7 +1591,6 @@ public java.util.List<com.google.api.DocumentationRule> getRulesList() {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1587,7 +1608,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1605,7 +1625,6 @@ public com.google.api.DocumentationRule getRules(int index) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1629,7 +1648,6 @@ public Builder setRules(int index, com.google.api.DocumentationRule value) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1650,7 +1668,6 @@ public Builder setRules(int index, com.google.api.DocumentationRule.Builder buil
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1674,7 +1691,6 @@ public Builder addRules(com.google.api.DocumentationRule value) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1698,7 +1714,6 @@ public Builder addRules(int index, com.google.api.DocumentationRule value) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1719,7 +1734,6 @@ public Builder addRules(com.google.api.DocumentationRule.Builder builderForValue
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1740,7 +1754,6 @@ public Builder addRules(int index, com.google.api.DocumentationRule.Builder buil
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1762,7 +1775,6 @@ public Builder addAllRules(
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1783,7 +1795,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1804,7 +1815,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1818,7 +1828,6 @@ public com.google.api.DocumentationRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1836,7 +1845,6 @@ public com.google.api.DocumentationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1855,7 +1863,6 @@ public com.google.api.DocumentationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1870,7 +1877,6 @@ public com.google.api.DocumentationRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1885,7 +1891,6 @@ public com.google.api.DocumentationRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationOrBuilder.java
index b8dbbb9cb6..11af64871f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationOrBuilder.java
@@ -110,7 +110,6 @@ public interface DocumentationOrBuilder
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -122,7 +121,6 @@ public interface DocumentationOrBuilder
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -134,7 +132,6 @@ public interface DocumentationOrBuilder
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -146,7 +143,6 @@ public interface DocumentationOrBuilder
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -158,7 +154,6 @@ public interface DocumentationOrBuilder
    *
    * <pre>
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
index 809dccbc87..68b53d491a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DocumentationRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DocumentationProto
         .internal_static_google_api_DocumentationRule_descriptor;
@@ -497,6 +502,39 @@ private void buildPartial0(com.google.api.DocumentationRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.DocumentationRule) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettings.java
index d1fb6bb6a3..5ef78bea9c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettings.java
@@ -38,9 +38,9 @@ private DotnetSettings(com.google.protobuf.GeneratedMessageV3.Builder<?> builder
   }
 
   private DotnetSettings() {
-    ignoredResources_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    ignoredResources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DotnetSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_DotnetSettings_descriptor;
   }
@@ -363,8 +368,7 @@ public java.lang.String getRenamedResourcesOrThrow(java.lang.String key) {
   public static final int IGNORED_RESOURCES_FIELD_NUMBER = 4;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList ignoredResources_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList ignoredResources_;
   /**
    *
    *
@@ -443,8 +447,7 @@ public com.google.protobuf.ByteString getIgnoredResourcesBytes(int index) {
   public static final int FORCED_NAMESPACE_ALIASES_FIELD_NUMBER = 5;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList forcedNamespaceAliases_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList forcedNamespaceAliases_;
   /**
    *
    *
@@ -511,8 +514,7 @@ public com.google.protobuf.ByteString getForcedNamespaceAliasesBytes(int index)
   public static final int HANDWRITTEN_SIGNATURES_FIELD_NUMBER = 6;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList handwrittenSignatures_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList handwrittenSignatures_;
   /**
    *
    *
@@ -894,9 +896,12 @@ public Builder clear() {
       }
       internalGetMutableRenamedServices().clear();
       internalGetMutableRenamedResources().clear();
-      ignoredResources_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      ignoredResources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000020);
       return this;
     }
 
@@ -922,6 +927,7 @@ public com.google.api.DotnetSettings build() {
     @java.lang.Override
     public com.google.api.DotnetSettings buildPartial() {
       com.google.api.DotnetSettings result = new com.google.api.DotnetSettings(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -929,6 +935,24 @@ public com.google.api.DotnetSettings buildPartial() {
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.api.DotnetSettings result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
+        ignoredResources_ = ignoredResources_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
+      }
+      result.ignoredResources_ = ignoredResources_;
+      if (((bitField0_ & 0x00000010) != 0)) {
+        forcedNamespaceAliases_ = forcedNamespaceAliases_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000010);
+      }
+      result.forcedNamespaceAliases_ = forcedNamespaceAliases_;
+      if (((bitField0_ & 0x00000020) != 0)) {
+        handwrittenSignatures_ = handwrittenSignatures_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000020);
+      }
+      result.handwrittenSignatures_ = handwrittenSignatures_;
+    }
+
     private void buildPartial0(com.google.api.DotnetSettings result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -942,18 +966,39 @@ private void buildPartial0(com.google.api.DotnetSettings result) {
         result.renamedResources_ = internalGetRenamedResources();
         result.renamedResources_.makeImmutable();
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        ignoredResources_.makeImmutable();
-        result.ignoredResources_ = ignoredResources_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        forcedNamespaceAliases_.makeImmutable();
-        result.forcedNamespaceAliases_ = forcedNamespaceAliases_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        handwrittenSignatures_.makeImmutable();
-        result.handwrittenSignatures_ = handwrittenSignatures_;
-      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -978,7 +1023,7 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
       if (!other.ignoredResources_.isEmpty()) {
         if (ignoredResources_.isEmpty()) {
           ignoredResources_ = other.ignoredResources_;
-          bitField0_ |= 0x00000008;
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureIgnoredResourcesIsMutable();
           ignoredResources_.addAll(other.ignoredResources_);
@@ -988,7 +1033,7 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
       if (!other.forcedNamespaceAliases_.isEmpty()) {
         if (forcedNamespaceAliases_.isEmpty()) {
           forcedNamespaceAliases_ = other.forcedNamespaceAliases_;
-          bitField0_ |= 0x00000010;
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           ensureForcedNamespaceAliasesIsMutable();
           forcedNamespaceAliases_.addAll(other.forcedNamespaceAliases_);
@@ -998,7 +1043,7 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
       if (!other.handwrittenSignatures_.isEmpty()) {
         if (handwrittenSignatures_.isEmpty()) {
           handwrittenSignatures_ = other.handwrittenSignatures_;
-          bitField0_ |= 0x00000020;
+          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
           ensureHandwrittenSignaturesIsMutable();
           handwrittenSignatures_.addAll(other.handwrittenSignatures_);
@@ -1678,14 +1723,14 @@ public Builder putAllRenamedResources(
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList ignoredResources_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList ignoredResources_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureIgnoredResourcesIsMutable() {
-      if (!ignoredResources_.isModifiable()) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         ignoredResources_ = new com.google.protobuf.LazyStringArrayList(ignoredResources_);
+        bitField0_ |= 0x00000008;
       }
-      bitField0_ |= 0x00000008;
     }
     /**
      *
@@ -1703,8 +1748,7 @@ private void ensureIgnoredResourcesIsMutable() {
      * @return A list containing the ignoredResources.
      */
     public com.google.protobuf.ProtocolStringList getIgnoredResourcesList() {
-      ignoredResources_.makeImmutable();
-      return ignoredResources_;
+      return ignoredResources_.getUnmodifiableView();
     }
     /**
      *
@@ -1785,7 +1829,6 @@ public Builder setIgnoredResources(int index, java.lang.String value) {
       }
       ensureIgnoredResourcesIsMutable();
       ignoredResources_.set(index, value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1811,7 +1854,6 @@ public Builder addIgnoredResources(java.lang.String value) {
       }
       ensureIgnoredResourcesIsMutable();
       ignoredResources_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1834,7 +1876,6 @@ public Builder addIgnoredResources(java.lang.String value) {
     public Builder addAllIgnoredResources(java.lang.Iterable<java.lang.String> values) {
       ensureIgnoredResourcesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, ignoredResources_);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1854,9 +1895,8 @@ public Builder addAllIgnoredResources(java.lang.Iterable<java.lang.String> value
      * @return This builder for chaining.
      */
     public Builder clearIgnoredResources() {
-      ignoredResources_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      ignoredResources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000008);
-      ;
       onChanged();
       return this;
     }
@@ -1883,20 +1923,19 @@ public Builder addIgnoredResourcesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureIgnoredResourcesIsMutable();
       ignoredResources_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList forcedNamespaceAliases_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList forcedNamespaceAliases_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureForcedNamespaceAliasesIsMutable() {
-      if (!forcedNamespaceAliases_.isModifiable()) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         forcedNamespaceAliases_ =
             new com.google.protobuf.LazyStringArrayList(forcedNamespaceAliases_);
+        bitField0_ |= 0x00000010;
       }
-      bitField0_ |= 0x00000010;
     }
     /**
      *
@@ -1911,8 +1950,7 @@ private void ensureForcedNamespaceAliasesIsMutable() {
      * @return A list containing the forcedNamespaceAliases.
      */
     public com.google.protobuf.ProtocolStringList getForcedNamespaceAliasesList() {
-      forcedNamespaceAliases_.makeImmutable();
-      return forcedNamespaceAliases_;
+      return forcedNamespaceAliases_.getUnmodifiableView();
     }
     /**
      *
@@ -1981,7 +2019,6 @@ public Builder setForcedNamespaceAliases(int index, java.lang.String value) {
       }
       ensureForcedNamespaceAliasesIsMutable();
       forcedNamespaceAliases_.set(index, value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2004,7 +2041,6 @@ public Builder addForcedNamespaceAliases(java.lang.String value) {
       }
       ensureForcedNamespaceAliasesIsMutable();
       forcedNamespaceAliases_.add(value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2024,7 +2060,6 @@ public Builder addForcedNamespaceAliases(java.lang.String value) {
     public Builder addAllForcedNamespaceAliases(java.lang.Iterable<java.lang.String> values) {
       ensureForcedNamespaceAliasesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, forcedNamespaceAliases_);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2041,9 +2076,8 @@ public Builder addAllForcedNamespaceAliases(java.lang.Iterable<java.lang.String>
      * @return This builder for chaining.
      */
     public Builder clearForcedNamespaceAliases() {
-      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000010);
-      ;
       onChanged();
       return this;
     }
@@ -2067,20 +2101,19 @@ public Builder addForcedNamespaceAliasesBytes(com.google.protobuf.ByteString val
       checkByteStringIsUtf8(value);
       ensureForcedNamespaceAliasesIsMutable();
       forcedNamespaceAliases_.add(value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList handwrittenSignatures_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList handwrittenSignatures_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureHandwrittenSignaturesIsMutable() {
-      if (!handwrittenSignatures_.isModifiable()) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         handwrittenSignatures_ =
             new com.google.protobuf.LazyStringArrayList(handwrittenSignatures_);
+        bitField0_ |= 0x00000020;
       }
-      bitField0_ |= 0x00000020;
     }
     /**
      *
@@ -2096,8 +2129,7 @@ private void ensureHandwrittenSignaturesIsMutable() {
      * @return A list containing the handwrittenSignatures.
      */
     public com.google.protobuf.ProtocolStringList getHandwrittenSignaturesList() {
-      handwrittenSignatures_.makeImmutable();
-      return handwrittenSignatures_;
+      return handwrittenSignatures_.getUnmodifiableView();
     }
     /**
      *
@@ -2170,7 +2202,6 @@ public Builder setHandwrittenSignatures(int index, java.lang.String value) {
       }
       ensureHandwrittenSignaturesIsMutable();
       handwrittenSignatures_.set(index, value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2194,7 +2225,6 @@ public Builder addHandwrittenSignatures(java.lang.String value) {
       }
       ensureHandwrittenSignaturesIsMutable();
       handwrittenSignatures_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2215,7 +2245,6 @@ public Builder addHandwrittenSignatures(java.lang.String value) {
     public Builder addAllHandwrittenSignatures(java.lang.Iterable<java.lang.String> values) {
       ensureHandwrittenSignaturesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, handwrittenSignatures_);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2233,9 +2262,8 @@ public Builder addAllHandwrittenSignatures(java.lang.Iterable<java.lang.String>
      * @return This builder for chaining.
      */
     public Builder clearHandwrittenSignatures() {
-      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000020);
-      ;
       onChanged();
       return this;
     }
@@ -2260,7 +2288,6 @@ public Builder addHandwrittenSignaturesBytes(com.google.protobuf.ByteString valu
       checkByteStringIsUtf8(value);
       ensureHandwrittenSignaturesIsMutable();
       handwrittenSignatures_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
index feea7e6337..0601b05d8d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
@@ -26,9 +26,7 @@
  * APIs. It is commonly known as a service endpoint. A service may expose
  * any number of service endpoints, and all service endpoints share the same
  * service definition, such as quota limits and monitoring metrics.
- *
  * Example:
- *
  *     type: google.api.Service
  *     name: library-example.googleapis.com
  *     endpoints:
@@ -59,7 +57,7 @@ private Endpoint(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
 
   private Endpoint() {
     name_ = "";
-    aliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     target_ = "";
   }
 
@@ -69,6 +67,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Endpoint();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.EndpointProto.internal_static_google_api_Endpoint_descriptor;
   }
@@ -135,18 +138,15 @@ public com.google.protobuf.ByteString getNameBytes() {
   public static final int ALIASES_FIELD_NUMBER = 2;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList aliases_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList aliases_;
   /**
    *
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -164,11 +164,9 @@ public com.google.protobuf.ProtocolStringList getAliasesList() {
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -186,11 +184,9 @@ public int getAliasesCount() {
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -209,11 +205,9 @@ public java.lang.String getAliases(int index) {
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -509,9 +503,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * APIs. It is commonly known as a service endpoint. A service may expose
    * any number of service endpoints, and all service endpoints share the same
    * service definition, such as quota limits and monitoring metrics.
-   *
    * Example:
-   *
    *     type: google.api.Service
    *     name: library-example.googleapis.com
    *     endpoints:
@@ -558,7 +550,8 @@ public Builder clear() {
       super.clear();
       bitField0_ = 0;
       name_ = "";
-      aliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       target_ = "";
       allowCors_ = false;
       return this;
@@ -586,6 +579,7 @@ public com.google.api.Endpoint build() {
     @java.lang.Override
     public com.google.api.Endpoint buildPartial() {
       com.google.api.Endpoint result = new com.google.api.Endpoint(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -593,15 +587,19 @@ public com.google.api.Endpoint buildPartial() {
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.api.Endpoint result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        aliases_ = aliases_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.aliases_ = aliases_;
+    }
+
     private void buildPartial0(com.google.api.Endpoint result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.name_ = name_;
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        aliases_.makeImmutable();
-        result.aliases_ = aliases_;
-      }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.target_ = target_;
       }
@@ -610,6 +608,39 @@ private void buildPartial0(com.google.api.Endpoint result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Endpoint) {
@@ -630,7 +661,7 @@ public Builder mergeFrom(com.google.api.Endpoint other) {
       if (!other.aliases_.isEmpty()) {
         if (aliases_.isEmpty()) {
           aliases_ = other.aliases_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureAliasesIsMutable();
           aliases_.addAll(other.aliases_);
@@ -821,25 +852,23 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList aliases_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList aliases_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAliasesIsMutable() {
-      if (!aliases_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         aliases_ = new com.google.protobuf.LazyStringArrayList(aliases_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000002;
     }
     /**
      *
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -850,19 +879,16 @@ private void ensureAliasesIsMutable() {
      */
     @java.lang.Deprecated
     public com.google.protobuf.ProtocolStringList getAliasesList() {
-      aliases_.makeImmutable();
-      return aliases_;
+      return aliases_.getUnmodifiableView();
     }
     /**
      *
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -880,11 +906,9 @@ public int getAliasesCount() {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -903,11 +927,9 @@ public java.lang.String getAliases(int index) {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -926,11 +948,9 @@ public com.google.protobuf.ByteString getAliasesBytes(int index) {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -948,7 +968,6 @@ public Builder setAliases(int index, java.lang.String value) {
       }
       ensureAliasesIsMutable();
       aliases_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -957,11 +976,9 @@ public Builder setAliases(int index, java.lang.String value) {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -978,7 +995,6 @@ public Builder addAliases(java.lang.String value) {
       }
       ensureAliasesIsMutable();
       aliases_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -987,11 +1003,9 @@ public Builder addAliases(java.lang.String value) {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -1005,7 +1019,6 @@ public Builder addAliases(java.lang.String value) {
     public Builder addAllAliases(java.lang.Iterable<java.lang.String> values) {
       ensureAliasesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, aliases_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1014,11 +1027,9 @@ public Builder addAllAliases(java.lang.Iterable<java.lang.String> values) {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -1029,9 +1040,8 @@ public Builder addAllAliases(java.lang.Iterable<java.lang.String> values) {
      */
     @java.lang.Deprecated
     public Builder clearAliases() {
-      aliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      ;
       onChanged();
       return this;
     }
@@ -1040,11 +1050,9 @@ public Builder clearAliases() {
      *
      * <pre>
      * Unimplemented. Dot not use.
-     *
      * DEPRECATED: This field is no longer supported. Instead of using aliases,
      * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
      * of the intended aliases.
-     *
      * Additional names that this endpoint will be hosted on.
      * </pre>
      *
@@ -1062,7 +1070,6 @@ public Builder addAliasesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureAliasesIsMutable();
       aliases_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java
index 0eb9aa6dc4..fae540697b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java
@@ -53,11 +53,9 @@ public interface EndpointOrBuilder
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -73,11 +71,9 @@ public interface EndpointOrBuilder
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -93,11 +89,9 @@ public interface EndpointOrBuilder
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
@@ -114,11 +108,9 @@ public interface EndpointOrBuilder
    *
    * <pre>
    * Unimplemented. Dot not use.
-   *
    * DEPRECATED: This field is no longer supported. Instead of using aliases,
    * please specify multiple [google.api.Endpoint][google.api.Endpoint] for each
    * of the intended aliases.
-   *
    * Additional names that this endpoint will be hosted on.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java
index a848229cfb..68f6de9284 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java
@@ -52,10 +52,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request is calling a disabled service for a consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" contacting
    * "pubsub.googleapis.com" service which is disabled:
-   *
    *     { "reason": "SERVICE_DISABLED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -63,7 +61,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the "pubsub.googleapis.com" has been disabled in
    * "projects/123".
    * </pre>
@@ -76,11 +73,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request whose associated billing account is disabled.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "pubsub.googleapis.com" service because the associated billing account is
    * disabled:
-   *
    *     { "reason": "BILLING_DISABLED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -88,7 +83,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the billing account associated has been disabled.
    * </pre>
    *
@@ -102,10 +96,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because the provided [API
    * key](https://cloud.google.com/docs/authentication/api-keys) is invalid. It
    * may be in a bad format, cannot be found, or has been expired).
-   *
    * Example of an ErrorInfo when the request is contacting
    * "storage.googleapis.com" service with an invalid API key:
-   *
    *     { "reason": "API_KEY_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -123,11 +115,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key API
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_api_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call the
    * "storage.googleapis.com" service because this service is restricted in the
    * API key:
-   *
    *     { "reason": "API_KEY_SERVICE_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -146,11 +136,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key HTTP
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_http_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the http referrer of the request
    * violates API key HTTP restrictions:
-   *
    *     { "reason": "API_KEY_HTTP_REFERRER_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -169,11 +157,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key IP address
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_application_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the caller IP of the request
    * violates API key IP address restrictions:
-   *
    *     { "reason": "API_KEY_IP_ADDRESS_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -192,11 +178,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key Android application
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_application_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the request from the Android apps
    * violates the API key Android application restrictions:
-   *
    *     { "reason": "API_KEY_ANDROID_APP_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -215,11 +199,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key iOS application
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_application_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the request from the iOS apps
    * violates the API key iOS application restrictions:
-   *
    *     { "reason": "API_KEY_IOS_APP_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -238,13 +220,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because there is not enough rate quota for the
    * consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "pubsub.googleapis.com" service because consumer's rate quota usage has
    * reached the maximum value set for the quota limit
    * "ReadsPerMinutePerProject" on the quota metric
    * "pubsub.googleapis.com/read_requests":
-   *
    *     { "reason": "RATE_LIMIT_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -254,12 +234,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "quota_limit": "ReadsPerMinutePerProject"
    *       }
    *     }
-   *
    * Example of an ErrorInfo when the consumer "projects/123" checks quota on
    * the service "dataflow.googleapis.com" and hits the organization quota
    * limit "DefaultRequestsPerMinutePerOrganization" on the metric
    * "dataflow.googleapis.com/default_requests".
-   *
    *     { "reason": "RATE_LIMIT_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -280,12 +258,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because there is not enough resource quota for the
    * consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "compute.googleapis.com" service because consumer's resource quota usage
    * has reached the maximum value set for the quota limit "VMsPerProject"
    * on the quota metric "compute.googleapis.com/vms":
-   *
    *     { "reason": "RESOURCE_QUOTA_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -295,12 +271,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "quota_limit": "VMsPerProject"
    *       }
    *     }
-   *
    * Example of an ErrorInfo when the consumer "projects/123" checks resource
    * quota on the service "dataflow.googleapis.com" and hits the organization
    * quota limit "jobs-per-organization" on the metric
    * "dataflow.googleapis.com/job_count".
-   *
    *     { "reason": "RESOURCE_QUOTA_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -322,11 +296,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request whose associated billing account address is in a tax restricted
    * location, violates the local tax restrictions when creating resources in
    * the restricted region.
-   *
    * Example of an ErrorInfo when creating the Cloud Storage Bucket in the
    * container "projects/123" under a tax restricted region
    * "locations/asia-northeast3":
-   *
    *     { "reason": "LOCATION_TAX_POLICY_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -335,7 +307,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "location": "locations/asia-northeast3"
    *       }
    *     }
-   *
    * This response indicates creating the Cloud Storage Bucket in
    * "locations/asia-northeast3" violates the location tax restriction.
    * </pre>
@@ -351,10 +322,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * on the user project "projects/123" or the user project is invalid. For more
    * information, check the [userProject System
    * Parameters](https://cloud.google.com/apis/docs/system-parameters).
-   *
    * Example of an ErrorInfo when the caller is calling Cloud Storage service
    * with insufficient permissions on the user project:
-   *
    *     { "reason": "USER_PROJECT_DENIED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -375,10 +344,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * to Terms of Service(Tos) violations. Check [Project suspension
    * guidelines](https://cloud.google.com/resource-manager/docs/project-suspension-guidelines)
    * for more information.
-   *
    * Example of an ErrorInfo when calling Cloud Storage service with the
    * suspended consumer "projects/123":
-   *
    *     { "reason": "CONSUMER_SUSPENDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -397,10 +364,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the associated consumer is invalid. It may be
    * in a bad format, cannot be found, or have been deleted.
-   *
    * Example of an ErrorInfo when calling Cloud Storage service with the
    * invalid consumer "projects/123":
-   *
    *     { "reason": "CONSUMER_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -423,11 +388,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * to search the audit log for a request rejected by VPC Service Controls. For
    * more information, please refer [VPC Service Controls
    * Troubleshooting](https://cloud.google.com/vpc-service-controls/docs/troubleshooting#unique-id)
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * Cloud Storage service because the request is prohibited by the VPC Service
    * Controls.
-   *
    *     { "reason": "SECURITY_POLICY_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -446,10 +409,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request is denied because the provided access token has expired.
-   *
    * Example of an ErrorInfo when the request is calling Cloud Storage service
    * with an expired access token:
-   *
    *     { "reason": "ACCESS_TOKEN_EXPIRED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -472,10 +433,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * APIs](https://developers.google.com/identity/protocols/oauth2/scopes) for
    * the list of the OAuth 2.0 scopes that you might need to request to access
    * the API.
-   *
    * Example of an ErrorInfo when the request is calling Cloud Storage service
    * with an access token that is missing required scopes:
-   *
    *     { "reason": "ACCESS_TOKEN_SCOPE_INSUFFICIENT",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -495,15 +454,12 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because the account associated with the provided
    * access token is in an invalid state, such as disabled or deleted.
    * For more information, see https://cloud.google.com/docs/authentication.
-   *
    * Warning: For privacy reasons, the server may not be able to disclose the
    * email address for some accounts. The client MUST NOT depend on the
    * availability of the `email` attribute.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Storage API with
    * an access token that is associated with a disabled or deleted [service
    * account](http://cloud/iam/docs/service-accounts):
-   *
    *     { "reason": "ACCOUNT_STATE_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -523,10 +479,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the type of the provided access token is not
    * supported by the API being called.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Storage API with
    * an unsupported token type.
-   *
    *     { "reason": "ACCESS_TOKEN_TYPE_UNSUPPORTED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -547,10 +501,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * credentials. For more information regarding the supported authentication
    * strategies for Google Cloud APIs, see
    * https://cloud.google.com/docs/authentication.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Storage API
    * without any authentication credentials.
-   *
    *     { "reason": "CREDENTIALS_MISSING",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -571,11 +523,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * which acts as the [API
    * consumer](https://cloud.google.com/apis/design/glossary#api_consumer) is
    * invalid. It may be in a bad format or empty.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Functions API,
    * but the offered resource project in the request in a bad format which can't
    * perform the ListFunctions method.
-   *
    *     { "reason": "RESOURCE_PROJECT_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -595,10 +545,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the provided session cookie is missing,
    * invalid or failed to decode.
-   *
    * Example of an ErrorInfo when the request is calling Cloud Storage service
    * with a SID cookie which can't be decoded.
-   *
    *     { "reason": "SESSION_COOKIE_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -618,12 +566,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the user is from a Google Workspace customer
    * that blocks their users from accessing a particular service.
-   *
    * Example scenario: https://support.google.com/a/answer/9197205?hl=en
-   *
    * Example of an ErrorInfo when access to Google Cloud Storage service is
    * blocked by the Google Workspace administrator:
-   *
    *     { "reason": "USER_BLOCKED_BY_ADMIN",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -644,10 +589,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * by administrators according to the organization policy constraint.
    * For more information see
    * https://cloud.google.com/resource-manager/docs/organization-policy/restricting-services.
-   *
    * Example of an ErrorInfo when access to Google Cloud Storage service is
    * restricted by Resource Usage Restriction policy:
-   *
    *     { "reason": "RESOURCE_USAGE_RESTRICTION_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -665,14 +608,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Unimplemented. Do not use.
-   *
    * The request is denied because it contains unsupported system parameters in
    * URL query parameters or HTTP headers. For more information,
    * see https://cloud.google.com/apis/docs/system-parameters
-   *
    * Example of an ErrorInfo when access "pubsub.googleapis.com" service with
    * a request header of "x-goog-user-ip":
-   *
    *     { "reason": "SYSTEM_PARAMETER_UNSUPPORTED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -692,10 +632,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because it violates Org Restriction: the requested
    * resource does not belong to allowed organizations specified in
    * "X-Goog-Allowed-Resources" header.
-   *
    * Example of an ErrorInfo when accessing a GCP resource that is restricted by
    * Org Restriction for "pubsub.googleapis.com" service.
-   *
    * {
    *   reason: "ORG_RESTRICTION_VIOLATION"
    *   domain: "googleapis.com"
@@ -715,11 +653,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because "X-Goog-Allowed-Resources" header is in a bad
    * format.
-   *
    * Example of an ErrorInfo when
    * accessing "pubsub.googleapis.com" service with an invalid
    * "X-Goog-Allowed-Resources" request header.
-   *
    * {
    *   reason: "ORG_RESTRICTION_HEADER_INVALID"
    *   domain: "googleapis.com"
@@ -738,12 +674,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Unimplemented. Do not use.
-   *
    * The request is calling a service that is not visible to the consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" contacting
    *  "pubsub.googleapis.com" service which is not visible to the consumer.
-   *
    *     { "reason": "SERVICE_NOT_VISIBLE",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -751,7 +684,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the "pubsub.googleapis.com" is not visible to
    * "projects/123" (or it may not exist).
    * </pre>
@@ -764,10 +696,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request is related to a project for which GCP access is suspended.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "pubsub.googleapis.com" service because GCP access is suspended:
-   *
    *     { "reason": "GCP_SUSPENDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -775,7 +705,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the associated GCP account has been suspended.
    * </pre>
    *
@@ -800,10 +729,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request is calling a disabled service for a consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" contacting
    * "pubsub.googleapis.com" service which is disabled:
-   *
    *     { "reason": "SERVICE_DISABLED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -811,7 +738,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the "pubsub.googleapis.com" has been disabled in
    * "projects/123".
    * </pre>
@@ -824,11 +750,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request whose associated billing account is disabled.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "pubsub.googleapis.com" service because the associated billing account is
    * disabled:
-   *
    *     { "reason": "BILLING_DISABLED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -836,7 +760,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the billing account associated has been disabled.
    * </pre>
    *
@@ -850,10 +773,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because the provided [API
    * key](https://cloud.google.com/docs/authentication/api-keys) is invalid. It
    * may be in a bad format, cannot be found, or has been expired).
-   *
    * Example of an ErrorInfo when the request is contacting
    * "storage.googleapis.com" service with an invalid API key:
-   *
    *     { "reason": "API_KEY_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -871,11 +792,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key API
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_api_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call the
    * "storage.googleapis.com" service because this service is restricted in the
    * API key:
-   *
    *     { "reason": "API_KEY_SERVICE_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -894,11 +813,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key HTTP
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_http_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the http referrer of the request
    * violates API key HTTP restrictions:
-   *
    *     { "reason": "API_KEY_HTTP_REFERRER_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -917,11 +834,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key IP address
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_application_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the caller IP of the request
    * violates API key IP address restrictions:
-   *
    *     { "reason": "API_KEY_IP_ADDRESS_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -940,11 +855,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key Android application
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_application_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the request from the Android apps
    * violates the API key Android application restrictions:
-   *
    *     { "reason": "API_KEY_ANDROID_APP_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -963,11 +876,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because it violates [API key iOS application
    * restrictions](https://cloud.google.com/docs/authentication/api-keys#adding_application_restrictions).
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * "storage.googleapis.com" service because the request from the iOS apps
    * violates the API key iOS application restrictions:
-   *
    *     { "reason": "API_KEY_IOS_APP_BLOCKED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -986,13 +897,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because there is not enough rate quota for the
    * consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "pubsub.googleapis.com" service because consumer's rate quota usage has
    * reached the maximum value set for the quota limit
    * "ReadsPerMinutePerProject" on the quota metric
    * "pubsub.googleapis.com/read_requests":
-   *
    *     { "reason": "RATE_LIMIT_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1002,12 +911,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "quota_limit": "ReadsPerMinutePerProject"
    *       }
    *     }
-   *
    * Example of an ErrorInfo when the consumer "projects/123" checks quota on
    * the service "dataflow.googleapis.com" and hits the organization quota
    * limit "DefaultRequestsPerMinutePerOrganization" on the metric
    * "dataflow.googleapis.com/default_requests".
-   *
    *     { "reason": "RATE_LIMIT_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1028,12 +935,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because there is not enough resource quota for the
    * consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "compute.googleapis.com" service because consumer's resource quota usage
    * has reached the maximum value set for the quota limit "VMsPerProject"
    * on the quota metric "compute.googleapis.com/vms":
-   *
    *     { "reason": "RESOURCE_QUOTA_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1043,12 +948,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "quota_limit": "VMsPerProject"
    *       }
    *     }
-   *
    * Example of an ErrorInfo when the consumer "projects/123" checks resource
    * quota on the service "dataflow.googleapis.com" and hits the organization
    * quota limit "jobs-per-organization" on the metric
    * "dataflow.googleapis.com/job_count".
-   *
    *     { "reason": "RESOURCE_QUOTA_EXCEEDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1070,11 +973,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request whose associated billing account address is in a tax restricted
    * location, violates the local tax restrictions when creating resources in
    * the restricted region.
-   *
    * Example of an ErrorInfo when creating the Cloud Storage Bucket in the
    * container "projects/123" under a tax restricted region
    * "locations/asia-northeast3":
-   *
    *     { "reason": "LOCATION_TAX_POLICY_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1083,7 +984,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "location": "locations/asia-northeast3"
    *       }
    *     }
-   *
    * This response indicates creating the Cloud Storage Bucket in
    * "locations/asia-northeast3" violates the location tax restriction.
    * </pre>
@@ -1099,10 +999,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * on the user project "projects/123" or the user project is invalid. For more
    * information, check the [userProject System
    * Parameters](https://cloud.google.com/apis/docs/system-parameters).
-   *
    * Example of an ErrorInfo when the caller is calling Cloud Storage service
    * with insufficient permissions on the user project:
-   *
    *     { "reason": "USER_PROJECT_DENIED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1123,10 +1021,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * to Terms of Service(Tos) violations. Check [Project suspension
    * guidelines](https://cloud.google.com/resource-manager/docs/project-suspension-guidelines)
    * for more information.
-   *
    * Example of an ErrorInfo when calling Cloud Storage service with the
    * suspended consumer "projects/123":
-   *
    *     { "reason": "CONSUMER_SUSPENDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1145,10 +1041,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the associated consumer is invalid. It may be
    * in a bad format, cannot be found, or have been deleted.
-   *
    * Example of an ErrorInfo when calling Cloud Storage service with the
    * invalid consumer "projects/123":
-   *
    *     { "reason": "CONSUMER_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1171,11 +1065,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * to search the audit log for a request rejected by VPC Service Controls. For
    * more information, please refer [VPC Service Controls
    * Troubleshooting](https://cloud.google.com/vpc-service-controls/docs/troubleshooting#unique-id)
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to call
    * Cloud Storage service because the request is prohibited by the VPC Service
    * Controls.
-   *
    *     { "reason": "SECURITY_POLICY_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1194,10 +1086,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request is denied because the provided access token has expired.
-   *
    * Example of an ErrorInfo when the request is calling Cloud Storage service
    * with an expired access token:
-   *
    *     { "reason": "ACCESS_TOKEN_EXPIRED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1220,10 +1110,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * APIs](https://developers.google.com/identity/protocols/oauth2/scopes) for
    * the list of the OAuth 2.0 scopes that you might need to request to access
    * the API.
-   *
    * Example of an ErrorInfo when the request is calling Cloud Storage service
    * with an access token that is missing required scopes:
-   *
    *     { "reason": "ACCESS_TOKEN_SCOPE_INSUFFICIENT",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1243,15 +1131,12 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because the account associated with the provided
    * access token is in an invalid state, such as disabled or deleted.
    * For more information, see https://cloud.google.com/docs/authentication.
-   *
    * Warning: For privacy reasons, the server may not be able to disclose the
    * email address for some accounts. The client MUST NOT depend on the
    * availability of the `email` attribute.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Storage API with
    * an access token that is associated with a disabled or deleted [service
    * account](http://cloud/iam/docs/service-accounts):
-   *
    *     { "reason": "ACCOUNT_STATE_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1271,10 +1156,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the type of the provided access token is not
    * supported by the API being called.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Storage API with
    * an unsupported token type.
-   *
    *     { "reason": "ACCESS_TOKEN_TYPE_UNSUPPORTED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1295,10 +1178,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * credentials. For more information regarding the supported authentication
    * strategies for Google Cloud APIs, see
    * https://cloud.google.com/docs/authentication.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Storage API
    * without any authentication credentials.
-   *
    *     { "reason": "CREDENTIALS_MISSING",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1319,11 +1200,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * which acts as the [API
    * consumer](https://cloud.google.com/apis/design/glossary#api_consumer) is
    * invalid. It may be in a bad format or empty.
-   *
    * Example of an ErrorInfo when the request is to the Cloud Functions API,
    * but the offered resource project in the request in a bad format which can't
    * perform the ListFunctions method.
-   *
    *     { "reason": "RESOURCE_PROJECT_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1343,10 +1222,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the provided session cookie is missing,
    * invalid or failed to decode.
-   *
    * Example of an ErrorInfo when the request is calling Cloud Storage service
    * with a SID cookie which can't be decoded.
-   *
    *     { "reason": "SESSION_COOKIE_INVALID",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1366,12 +1243,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because the user is from a Google Workspace customer
    * that blocks their users from accessing a particular service.
-   *
    * Example scenario: https://support.google.com/a/answer/9197205?hl=en
-   *
    * Example of an ErrorInfo when access to Google Cloud Storage service is
    * blocked by the Google Workspace administrator:
-   *
    *     { "reason": "USER_BLOCKED_BY_ADMIN",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1392,10 +1266,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * by administrators according to the organization policy constraint.
    * For more information see
    * https://cloud.google.com/resource-manager/docs/organization-policy/restricting-services.
-   *
    * Example of an ErrorInfo when access to Google Cloud Storage service is
    * restricted by Resource Usage Restriction policy:
-   *
    *     { "reason": "RESOURCE_USAGE_RESTRICTION_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1413,14 +1285,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Unimplemented. Do not use.
-   *
    * The request is denied because it contains unsupported system parameters in
    * URL query parameters or HTTP headers. For more information,
    * see https://cloud.google.com/apis/docs/system-parameters
-   *
    * Example of an ErrorInfo when access "pubsub.googleapis.com" service with
    * a request header of "x-goog-user-ip":
-   *
    *     { "reason": "SYSTEM_PARAMETER_UNSUPPORTED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1440,10 +1309,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because it violates Org Restriction: the requested
    * resource does not belong to allowed organizations specified in
    * "X-Goog-Allowed-Resources" header.
-   *
    * Example of an ErrorInfo when accessing a GCP resource that is restricted by
    * Org Restriction for "pubsub.googleapis.com" service.
-   *
    * {
    *   reason: "ORG_RESTRICTION_VIOLATION"
    *   domain: "googleapis.com"
@@ -1463,11 +1330,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request is denied because "X-Goog-Allowed-Resources" header is in a bad
    * format.
-   *
    * Example of an ErrorInfo when
    * accessing "pubsub.googleapis.com" service with an invalid
    * "X-Goog-Allowed-Resources" request header.
-   *
    * {
    *   reason: "ORG_RESTRICTION_HEADER_INVALID"
    *   domain: "googleapis.com"
@@ -1486,12 +1351,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Unimplemented. Do not use.
-   *
    * The request is calling a service that is not visible to the consumer.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" contacting
    *  "pubsub.googleapis.com" service which is not visible to the consumer.
-   *
    *     { "reason": "SERVICE_NOT_VISIBLE",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1499,7 +1361,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the "pubsub.googleapis.com" is not visible to
    * "projects/123" (or it may not exist).
    * </pre>
@@ -1512,10 +1373,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The request is related to a project for which GCP access is suspended.
-   *
    * Example of an ErrorInfo when the consumer "projects/123" fails to contact
    * "pubsub.googleapis.com" service because GCP access is suspended:
-   *
    *     { "reason": "GCP_SUSPENDED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1523,7 +1382,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the associated GCP account has been suspended.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehavior.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehavior.java
index a0c5464986..9b2fd46279 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehavior.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehavior.java
@@ -26,7 +26,6 @@
  * is required in requests, or given as output but ignored as input).
  * This **does not** change the behavior in protocol buffers itself; it only
  * denotes the behavior and may affect how API tooling handles the field.
- *
  * Note: This enum **may** receive new values in the future.
  * </pre>
  *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehaviorProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehaviorProto.java
index 191d7a1ac2..07ab7e51a0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehaviorProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldBehaviorProto.java
@@ -36,9 +36,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    * <pre>
    * A designation of a specific field behavior (required, output only, etc.)
    * in protobuf messages.
-   *
    * Examples:
-   *
    *   string name = 1 [(google.api.field_behavior) = REQUIRED];
    *   State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
    *   google.protobuf.Duration ttl = 1
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java
index 1658b588a5..bb22becb93 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GoSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_GoSettings_descriptor;
   }
@@ -345,6 +350,39 @@ private void buildPartial0(com.google.api.GoSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.GoSettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java
index 5f603701ed..da9fd8337d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Http();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpProto.internal_static_google_api_Http_descriptor;
   }
@@ -70,7 +75,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -85,7 +89,6 @@ public java.util.List<com.google.api.HttpRule> getRulesList() {
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -100,7 +103,6 @@ public java.util.List<? extends com.google.api.HttpRuleOrBuilder> getRulesOrBuil
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -115,7 +117,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -130,7 +131,6 @@ public com.google.api.HttpRule getRules(int index) {
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -150,7 +150,6 @@ public com.google.api.HttpRuleOrBuilder getRulesOrBuilder(int index) {
    * When set to true, URL path parameters will be fully URI-decoded except in
    * cases of single segment matches in reserved expansion, where "%2F" will be
    * left encoded.
-   *
    * The default behavior is to not decode RFC 6570 reserved characters in multi
    * segment matches.
    * </pre>
@@ -432,6 +431,39 @@ private void buildPartial0(com.google.api.Http result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Http) {
@@ -557,7 +589,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -575,7 +606,6 @@ public java.util.List<com.google.api.HttpRule> getRulesList() {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -593,7 +623,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -611,7 +640,6 @@ public com.google.api.HttpRule getRules(int index) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -635,7 +663,6 @@ public Builder setRules(int index, com.google.api.HttpRule value) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -656,7 +683,6 @@ public Builder setRules(int index, com.google.api.HttpRule.Builder builderForVal
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -680,7 +706,6 @@ public Builder addRules(com.google.api.HttpRule value) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -704,7 +729,6 @@ public Builder addRules(int index, com.google.api.HttpRule value) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -725,7 +749,6 @@ public Builder addRules(com.google.api.HttpRule.Builder builderForValue) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -746,7 +769,6 @@ public Builder addRules(int index, com.google.api.HttpRule.Builder builderForVal
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -767,7 +789,6 @@ public Builder addAllRules(java.lang.Iterable<? extends com.google.api.HttpRule>
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -788,7 +809,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -809,7 +829,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -823,7 +842,6 @@ public com.google.api.HttpRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -841,7 +859,6 @@ public com.google.api.HttpRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -859,7 +876,6 @@ public java.util.List<? extends com.google.api.HttpRuleOrBuilder> getRulesOrBuil
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -873,7 +889,6 @@ public com.google.api.HttpRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -887,7 +902,6 @@ public com.google.api.HttpRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -922,7 +936,6 @@ public java.util.List<com.google.api.HttpRule.Builder> getRulesBuilderList() {
      * When set to true, URL path parameters will be fully URI-decoded except in
      * cases of single segment matches in reserved expansion, where "%2F" will be
      * left encoded.
-     *
      * The default behavior is to not decode RFC 6570 reserved characters in multi
      * segment matches.
      * </pre>
@@ -942,7 +955,6 @@ public boolean getFullyDecodeReservedExpansion() {
      * When set to true, URL path parameters will be fully URI-decoded except in
      * cases of single segment matches in reserved expansion, where "%2F" will be
      * left encoded.
-     *
      * The default behavior is to not decode RFC 6570 reserved characters in multi
      * segment matches.
      * </pre>
@@ -966,7 +978,6 @@ public Builder setFullyDecodeReservedExpansion(boolean value) {
      * When set to true, URL path parameters will be fully URI-decoded except in
      * cases of single segment matches in reserved expansion, where "%2F" will be
      * left encoded.
-     *
      * The default behavior is to not decode RFC 6570 reserved characters in multi
      * segment matches.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
index a102cee5e7..141f53de8a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
@@ -25,44 +25,31 @@
  * Message that represents an arbitrary HTTP body. It should only be used for
  * payload formats that can't be represented as JSON, such as raw binary or
  * an HTML page.
- *
- *
  * This message can be used both in streaming and non-streaming API methods in
  * the request as well as the response.
- *
  * It can be used as a top-level request field, which is convenient if one
  * wants to extract parameters from either the URL or HTTP template into the
  * request fields and also want access to the raw HTTP body.
- *
  * Example:
- *
  *     message GetResourceRequest {
  *       // A unique request id.
  *       string request_id = 1;
- *
  *       // The raw HTTP body is bound to this field.
  *       google.api.HttpBody http_body = 2;
- *
  *     }
- *
  *     service ResourceService {
  *       rpc GetResource(GetResourceRequest)
  *         returns (google.api.HttpBody);
  *       rpc UpdateResource(google.api.HttpBody)
  *         returns (google.protobuf.Empty);
- *
  *     }
- *
  * Example with streaming methods:
- *
  *     service CaldavService {
  *       rpc GetCalendar(stream google.api.HttpBody)
  *         returns (stream google.api.HttpBody);
  *       rpc UpdateCalendar(stream google.api.HttpBody)
  *         returns (stream google.api.HttpBody);
- *
  *     }
- *
  * Use of this type only changes how the request and response bodies are
  * handled, all other features will continue to work unchanged.
  * </pre>
@@ -91,6 +78,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new HttpBody();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_descriptor;
   }
@@ -431,44 +423,31 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Message that represents an arbitrary HTTP body. It should only be used for
    * payload formats that can't be represented as JSON, such as raw binary or
    * an HTML page.
-   *
-   *
    * This message can be used both in streaming and non-streaming API methods in
    * the request as well as the response.
-   *
    * It can be used as a top-level request field, which is convenient if one
    * wants to extract parameters from either the URL or HTTP template into the
    * request fields and also want access to the raw HTTP body.
-   *
    * Example:
-   *
    *     message GetResourceRequest {
    *       // A unique request id.
    *       string request_id = 1;
-   *
    *       // The raw HTTP body is bound to this field.
    *       google.api.HttpBody http_body = 2;
-   *
    *     }
-   *
    *     service ResourceService {
    *       rpc GetResource(GetResourceRequest)
    *         returns (google.api.HttpBody);
    *       rpc UpdateResource(google.api.HttpBody)
    *         returns (google.protobuf.Empty);
-   *
    *     }
-   *
    * Example with streaming methods:
-   *
    *     service CaldavService {
    *       rpc GetCalendar(stream google.api.HttpBody)
    *         returns (stream google.api.HttpBody);
    *       rpc UpdateCalendar(stream google.api.HttpBody)
    *         returns (stream google.api.HttpBody);
-   *
    *     }
-   *
    * Use of this type only changes how the request and response bodies are
    * handled, all other features will continue to work unchanged.
    * </pre>
@@ -566,6 +545,39 @@ private void buildPartial0(com.google.api.HttpBody result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.HttpBody) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpOrBuilder.java
index 2ddb68e8e0..17900f27ac 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpOrBuilder.java
@@ -28,7 +28,6 @@ public interface HttpOrBuilder
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -40,7 +39,6 @@ public interface HttpOrBuilder
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -52,7 +50,6 @@ public interface HttpOrBuilder
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -64,7 +61,6 @@ public interface HttpOrBuilder
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -76,7 +72,6 @@ public interface HttpOrBuilder
    *
    * <pre>
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -91,7 +86,6 @@ public interface HttpOrBuilder
    * When set to true, URL path parameters will be fully URI-decoded except in
    * cases of single segment matches in reserved expansion, where "%2F" will be
    * left encoded.
-   *
    * The default behavior is to not decode RFC 6570 reserved characters in multi
    * segment matches.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java
index 1a30d9d387..03212bbdab 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java
@@ -23,7 +23,6 @@
  *
  * <pre>
  * # gRPC Transcoding
- *
  * gRPC Transcoding is a feature for mapping between a gRPC method and one or
  * more HTTP REST endpoints. It allows developers to build a single API service
  * that supports both gRPC APIs and REST APIs. Many systems, including [Google
@@ -32,21 +31,17 @@
  * Gateway](https://github.com/grpc-ecosystem/grpc-gateway),
  * and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature
  * and use it for large scale production services.
- *
  * `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies
  * how different portions of the gRPC request message are mapped to the URL
  * path, URL query parameters, and HTTP request body. It also controls how the
  * gRPC response message is mapped to the HTTP response body. `HttpRule` is
  * typically specified as an `google.api.http` annotation on the gRPC method.
- *
  * Each mapping specifies a URL path template and an HTTP method. The path
  * template may refer to one or more fields in the gRPC request message, as long
  * as each field is a non-repeated field with a primitive (non-message) type.
  * The path template controls how fields of the request message are mapped to
  * the URL path.
- *
  * Example:
- *
  *     service Messaging {
  *       rpc GetMessage(GetMessageRequest) returns (Message) {
  *         option (google.api.http) = {
@@ -60,17 +55,13 @@
  *     message Message {
  *       string text = 1; // The resource content.
  *     }
- *
  * This enables an HTTP REST to gRPC mapping as below:
- *
  * HTTP | gRPC
  * -----|-----
  * `GET /v1/messages/123456`  | `GetMessage(name: "messages/123456")`
- *
  * Any fields in the request message which are not bound by the path template
  * automatically become HTTP query parameters if there is no HTTP request body.
  * For example:
- *
  *     service Messaging {
  *       rpc GetMessage(GetMessageRequest) returns (Message) {
  *         option (google.api.http) = {
@@ -86,26 +77,21 @@
  *       int64 revision = 2;    // Mapped to URL query parameter `revision`.
  *       SubMessage sub = 3;    // Mapped to URL query parameter `sub.subfield`.
  *     }
- *
  * This enables a HTTP JSON to RPC mapping as below:
- *
  * HTTP | gRPC
  * -----|-----
  * `GET /v1/messages/123456?revision=2&amp;sub.subfield=foo` |
  * `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield:
  * "foo"))`
- *
  * Note that fields which are mapped to URL query parameters must have a
  * primitive type or a repeated primitive type or a non-repeated message type.
  * In the case of a repeated type, the parameter can be repeated in the URL
  * as `...?param=A&amp;param=B`. In the case of a message type, each field of the
  * message is mapped to a separate parameter, such as
  * `...?foo.a=A&amp;foo.b=B&amp;foo.c=C`.
- *
  * For HTTP methods that allow a request body, the `body` field
  * specifies the mapping. Consider a REST update method on the
  * message resource collection:
- *
  *     service Messaging {
  *       rpc UpdateMessage(UpdateMessageRequest) returns (Message) {
  *         option (google.api.http) = {
@@ -118,21 +104,17 @@
  *       string message_id = 1; // mapped to the URL
  *       Message message = 2;   // mapped to the body
  *     }
- *
  * The following HTTP JSON to RPC mapping is enabled, where the
  * representation of the JSON in the request body is determined by
  * protos JSON encoding:
- *
  * HTTP | gRPC
  * -----|-----
  * `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
  * "123456" message { text: "Hi!" })`
- *
  * The special name `*` can be used in the body mapping to define that
  * every field not bound by the path template should be mapped to the
  * request body.  This enables the following alternative definition of
  * the update method:
- *
  *     service Messaging {
  *       rpc UpdateMessage(Message) returns (Message) {
  *         option (google.api.http) = {
@@ -145,24 +127,18 @@
  *       string message_id = 1;
  *       string text = 2;
  *     }
- *
- *
  * The following HTTP JSON to RPC mapping is enabled:
- *
  * HTTP | gRPC
  * -----|-----
  * `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
  * "123456" text: "Hi!")`
- *
  * Note that when using `*` in the body mapping, it is not possible to
  * have HTTP parameters, as all fields not bound by the path end in
  * the body. This makes this option more rarely used in practice when
  * defining REST APIs. The common usage of `*` is in custom methods
  * which don't use the URL at all for transferring data.
- *
  * It is possible to define multiple HTTP methods for one RPC by using
  * the `additional_bindings` option. Example:
- *
  *     service Messaging {
  *       rpc GetMessage(GetMessageRequest) returns (Message) {
  *         option (google.api.http) = {
@@ -177,17 +153,13 @@
  *       string message_id = 1;
  *       string user_id = 2;
  *     }
- *
  * This enables the following two alternative HTTP JSON to RPC mappings:
- *
  * HTTP | gRPC
  * -----|-----
  * `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
  * `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id:
  * "123456")`
- *
  * ## Rules for HTTP mapping
- *
  * 1. Leaf request fields (recursive expansion nested messages in the request
  *    message) are classified into three categories:
  *    - Fields referred by the path template. They are passed via the URL path.
@@ -204,29 +176,23 @@
  *  3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP
  *  request body, all
  *     fields are passed via URL path and URL query parameters.
- *
  * ### Path template syntax
- *
  *     Template = "/" Segments [ Verb ] ;
  *     Segments = Segment { "/" Segment } ;
  *     Segment  = "*" | "**" | LITERAL | Variable ;
  *     Variable = "{" FieldPath [ "=" Segments ] "}" ;
  *     FieldPath = IDENT { "." IDENT } ;
  *     Verb     = ":" LITERAL ;
- *
  * The syntax `*` matches a single URL path segment. The syntax `**` matches
  * zero or more URL path segments, which must be the last part of the URL path
  * except the `Verb`.
- *
  * The syntax `Variable` matches part of the URL path as specified by its
  * template. A variable template must not contain other variables. If a variable
  * matches a single path segment, its template may be omitted, e.g. `{var}`
  * is equivalent to `{var=*}`.
- *
  * The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL`
  * contains any reserved character, such characters should be percent-encoded
  * before the matching.
- *
  * If a variable contains exactly one path segment, such as `"{var}"` or
  * `"{var=*}"`, when such a variable is expanded into a URL path on the client
  * side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The
@@ -234,7 +200,6 @@
  * [Discovery
  * Document](https://developers.google.com/discovery/v1/reference/apis) as
  * `{var}`.
- *
  * If a variable contains multiple path segments, such as `"{var=foo/&#42;}"`
  * or `"{var=**}"`, when such a variable is expanded into a URL path on the
  * client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded.
@@ -243,14 +208,11 @@
  * [Discovery
  * Document](https://developers.google.com/discovery/v1/reference/apis) as
  * `{+var}`.
- *
  * ## Using gRPC API Service Configuration
- *
  * gRPC API Service Configuration (service config) is a configuration language
  * for configuring a gRPC service to become a user-facing product. The
  * service config is simply the YAML representation of the `google.api.Service`
  * proto message.
- *
  * As an alternative to annotating your proto file, you can configure gRPC
  * transcoding in your service config YAML files. You do this by specifying a
  * `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same
@@ -258,21 +220,16 @@
  * have a proto that is reused in multiple services. Note that any transcoding
  * specified in the service config will override any matching transcoding
  * configuration in the proto.
- *
  * Example:
- *
  *     http:
  *       rules:
  *         # Selects a gRPC method and applies HttpRule to it.
  *         - selector: example.v1.Messaging.GetMessage
  *           get: /v1/messages/{message_id}/{sub.subfield}
- *
  * ## Special notes
- *
  * When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the
  * proto to JSON conversion must follow the [proto3
  * specification](https://developers.google.com/protocol-buffers/docs/proto3#json).
- *
  * While the single segment variable follows the semantics of
  * [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String
  * Expansion, the multi segment variable **does not** follow RFC 6570 Section
@@ -280,17 +237,13 @@
  * does not expand special characters like `?` and `#`, which would lead
  * to invalid URLs. As the result, gRPC Transcoding uses a custom encoding
  * for multi segment variables.
- *
  * The path variables **must not** refer to any repeated or mapped field,
  * because client libraries are not capable of handling such variable expansion.
- *
  * The path variables **must not** capture the leading "/" character. The reason
  * is that the most common use case "{var}" does not capture the leading "/"
  * character. For consistency, all path variables must share the same behavior.
- *
  * Repeated message fields must not be mapped to URL query parameters, because
  * no client library can support such complicated mapping.
- *
  * If an API needs to use a JSON array for request or response body, it can map
  * the request or response body to a repeated field. However, some gRPC
  * Transcoding implementations may not support this feature.
@@ -321,6 +274,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new HttpRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpProto.internal_static_google_api_HttpRule_descriptor;
   }
@@ -334,8 +292,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int patternCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object pattern_;
 
   public enum PatternCase
@@ -403,7 +359,6 @@ public PatternCase getPatternCase() {
    *
    * <pre>
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -429,7 +384,6 @@ public java.lang.String getSelector() {
    *
    * <pre>
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -875,7 +829,6 @@ public com.google.api.CustomHttpPatternOrBuilder getCustomOrBuilder() {
    * The name of the request field whose value is mapped to the HTTP request
    * body, or `*` for mapping all request fields not captured by the path
    * pattern to the HTTP body, or omitted for not having any HTTP request body.
-   *
    * NOTE: the referred field must be present at the top-level of the request
    * message type.
    * </pre>
@@ -903,7 +856,6 @@ public java.lang.String getBody() {
    * The name of the request field whose value is mapped to the HTTP request
    * body, or `*` for mapping all request fields not captured by the path
    * pattern to the HTTP body, or omitted for not having any HTTP request body.
-   *
    * NOTE: the referred field must be present at the top-level of the request
    * message type.
    * </pre>
@@ -936,7 +888,6 @@ public com.google.protobuf.ByteString getBodyBytes() {
    * Optional. The name of the response field whose value is mapped to the HTTP
    * response body. When omitted, the entire response message will be used
    * as the HTTP response body.
-   *
    * NOTE: The referred field must be present at the top-level of the response
    * message type.
    * </pre>
@@ -964,7 +915,6 @@ public java.lang.String getResponseBody() {
    * Optional. The name of the response field whose value is mapped to the HTTP
    * response body. When omitted, the entire response message will be used
    * as the HTTP response body.
-   *
    * NOTE: The referred field must be present at the top-level of the response
    * message type.
    * </pre>
@@ -1348,7 +1298,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * # gRPC Transcoding
-   *
    * gRPC Transcoding is a feature for mapping between a gRPC method and one or
    * more HTTP REST endpoints. It allows developers to build a single API service
    * that supports both gRPC APIs and REST APIs. Many systems, including [Google
@@ -1357,21 +1306,17 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Gateway](https://github.com/grpc-ecosystem/grpc-gateway),
    * and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature
    * and use it for large scale production services.
-   *
    * `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies
    * how different portions of the gRPC request message are mapped to the URL
    * path, URL query parameters, and HTTP request body. It also controls how the
    * gRPC response message is mapped to the HTTP response body. `HttpRule` is
    * typically specified as an `google.api.http` annotation on the gRPC method.
-   *
    * Each mapping specifies a URL path template and an HTTP method. The path
    * template may refer to one or more fields in the gRPC request message, as long
    * as each field is a non-repeated field with a primitive (non-message) type.
    * The path template controls how fields of the request message are mapped to
    * the URL path.
-   *
    * Example:
-   *
    *     service Messaging {
    *       rpc GetMessage(GetMessageRequest) returns (Message) {
    *         option (google.api.http) = {
@@ -1385,17 +1330,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *     message Message {
    *       string text = 1; // The resource content.
    *     }
-   *
    * This enables an HTTP REST to gRPC mapping as below:
-   *
    * HTTP | gRPC
    * -----|-----
    * `GET /v1/messages/123456`  | `GetMessage(name: "messages/123456")`
-   *
    * Any fields in the request message which are not bound by the path template
    * automatically become HTTP query parameters if there is no HTTP request body.
    * For example:
-   *
    *     service Messaging {
    *       rpc GetMessage(GetMessageRequest) returns (Message) {
    *         option (google.api.http) = {
@@ -1411,26 +1352,21 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       int64 revision = 2;    // Mapped to URL query parameter `revision`.
    *       SubMessage sub = 3;    // Mapped to URL query parameter `sub.subfield`.
    *     }
-   *
    * This enables a HTTP JSON to RPC mapping as below:
-   *
    * HTTP | gRPC
    * -----|-----
    * `GET /v1/messages/123456?revision=2&amp;sub.subfield=foo` |
    * `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield:
    * "foo"))`
-   *
    * Note that fields which are mapped to URL query parameters must have a
    * primitive type or a repeated primitive type or a non-repeated message type.
    * In the case of a repeated type, the parameter can be repeated in the URL
    * as `...?param=A&amp;param=B`. In the case of a message type, each field of the
    * message is mapped to a separate parameter, such as
    * `...?foo.a=A&amp;foo.b=B&amp;foo.c=C`.
-   *
    * For HTTP methods that allow a request body, the `body` field
    * specifies the mapping. Consider a REST update method on the
    * message resource collection:
-   *
    *     service Messaging {
    *       rpc UpdateMessage(UpdateMessageRequest) returns (Message) {
    *         option (google.api.http) = {
@@ -1443,21 +1379,17 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       string message_id = 1; // mapped to the URL
    *       Message message = 2;   // mapped to the body
    *     }
-   *
    * The following HTTP JSON to RPC mapping is enabled, where the
    * representation of the JSON in the request body is determined by
    * protos JSON encoding:
-   *
    * HTTP | gRPC
    * -----|-----
    * `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
    * "123456" message { text: "Hi!" })`
-   *
    * The special name `*` can be used in the body mapping to define that
    * every field not bound by the path template should be mapped to the
    * request body.  This enables the following alternative definition of
    * the update method:
-   *
    *     service Messaging {
    *       rpc UpdateMessage(Message) returns (Message) {
    *         option (google.api.http) = {
@@ -1470,24 +1402,18 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       string message_id = 1;
    *       string text = 2;
    *     }
-   *
-   *
    * The following HTTP JSON to RPC mapping is enabled:
-   *
    * HTTP | gRPC
    * -----|-----
    * `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
    * "123456" text: "Hi!")`
-   *
    * Note that when using `*` in the body mapping, it is not possible to
    * have HTTP parameters, as all fields not bound by the path end in
    * the body. This makes this option more rarely used in practice when
    * defining REST APIs. The common usage of `*` is in custom methods
    * which don't use the URL at all for transferring data.
-   *
    * It is possible to define multiple HTTP methods for one RPC by using
    * the `additional_bindings` option. Example:
-   *
    *     service Messaging {
    *       rpc GetMessage(GetMessageRequest) returns (Message) {
    *         option (google.api.http) = {
@@ -1502,17 +1428,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       string message_id = 1;
    *       string user_id = 2;
    *     }
-   *
    * This enables the following two alternative HTTP JSON to RPC mappings:
-   *
    * HTTP | gRPC
    * -----|-----
    * `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
    * `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id:
    * "123456")`
-   *
    * ## Rules for HTTP mapping
-   *
    * 1. Leaf request fields (recursive expansion nested messages in the request
    *    message) are classified into three categories:
    *    - Fields referred by the path template. They are passed via the URL path.
@@ -1529,29 +1451,23 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *  3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP
    *  request body, all
    *     fields are passed via URL path and URL query parameters.
-   *
    * ### Path template syntax
-   *
    *     Template = "/" Segments [ Verb ] ;
    *     Segments = Segment { "/" Segment } ;
    *     Segment  = "*" | "**" | LITERAL | Variable ;
    *     Variable = "{" FieldPath [ "=" Segments ] "}" ;
    *     FieldPath = IDENT { "." IDENT } ;
    *     Verb     = ":" LITERAL ;
-   *
    * The syntax `*` matches a single URL path segment. The syntax `**` matches
    * zero or more URL path segments, which must be the last part of the URL path
    * except the `Verb`.
-   *
    * The syntax `Variable` matches part of the URL path as specified by its
    * template. A variable template must not contain other variables. If a variable
    * matches a single path segment, its template may be omitted, e.g. `{var}`
    * is equivalent to `{var=*}`.
-   *
    * The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL`
    * contains any reserved character, such characters should be percent-encoded
    * before the matching.
-   *
    * If a variable contains exactly one path segment, such as `"{var}"` or
    * `"{var=*}"`, when such a variable is expanded into a URL path on the client
    * side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The
@@ -1559,7 +1475,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * [Discovery
    * Document](https://developers.google.com/discovery/v1/reference/apis) as
    * `{var}`.
-   *
    * If a variable contains multiple path segments, such as `"{var=foo/&#42;}"`
    * or `"{var=**}"`, when such a variable is expanded into a URL path on the
    * client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded.
@@ -1568,14 +1483,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * [Discovery
    * Document](https://developers.google.com/discovery/v1/reference/apis) as
    * `{+var}`.
-   *
    * ## Using gRPC API Service Configuration
-   *
    * gRPC API Service Configuration (service config) is a configuration language
    * for configuring a gRPC service to become a user-facing product. The
    * service config is simply the YAML representation of the `google.api.Service`
    * proto message.
-   *
    * As an alternative to annotating your proto file, you can configure gRPC
    * transcoding in your service config YAML files. You do this by specifying a
    * `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same
@@ -1583,21 +1495,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * have a proto that is reused in multiple services. Note that any transcoding
    * specified in the service config will override any matching transcoding
    * configuration in the proto.
-   *
    * Example:
-   *
    *     http:
    *       rules:
    *         # Selects a gRPC method and applies HttpRule to it.
    *         - selector: example.v1.Messaging.GetMessage
    *           get: /v1/messages/{message_id}/{sub.subfield}
-   *
    * ## Special notes
-   *
    * When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the
    * proto to JSON conversion must follow the [proto3
    * specification](https://developers.google.com/protocol-buffers/docs/proto3#json).
-   *
    * While the single segment variable follows the semantics of
    * [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String
    * Expansion, the multi segment variable **does not** follow RFC 6570 Section
@@ -1605,17 +1512,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * does not expand special characters like `?` and `#`, which would lead
    * to invalid URLs. As the result, gRPC Transcoding uses a custom encoding
    * for multi segment variables.
-   *
    * The path variables **must not** refer to any repeated or mapped field,
    * because client libraries are not capable of handling such variable expansion.
-   *
    * The path variables **must not** capture the leading "/" character. The reason
    * is that the most common use case "{var}" does not capture the leading "/"
    * character. For consistency, all path variables must share the same behavior.
-   *
    * Repeated message fields must not be mapped to URL query parameters, because
    * no client library can support such complicated mapping.
-   *
    * If an API needs to use a JSON array for request or response body, it can map
    * the request or response body to a repeated field. However, some gRPC
    * Transcoding implementations may not support this feature.
@@ -1732,6 +1635,39 @@ private void buildPartialOneofs(com.google.api.HttpRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.HttpRule) {
@@ -1968,7 +1904,6 @@ public Builder clearPattern() {
      *
      * <pre>
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -1993,7 +1928,6 @@ public java.lang.String getSelector() {
      *
      * <pre>
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -2018,7 +1952,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * <pre>
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -2042,7 +1975,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * <pre>
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -2062,7 +1994,6 @@ public Builder clearSelector() {
      *
      * <pre>
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -3000,7 +2931,6 @@ public com.google.api.CustomHttpPatternOrBuilder getCustomOrBuilder() {
      * The name of the request field whose value is mapped to the HTTP request
      * body, or `*` for mapping all request fields not captured by the path
      * pattern to the HTTP body, or omitted for not having any HTTP request body.
-     *
      * NOTE: the referred field must be present at the top-level of the request
      * message type.
      * </pre>
@@ -3027,7 +2957,6 @@ public java.lang.String getBody() {
      * The name of the request field whose value is mapped to the HTTP request
      * body, or `*` for mapping all request fields not captured by the path
      * pattern to the HTTP body, or omitted for not having any HTTP request body.
-     *
      * NOTE: the referred field must be present at the top-level of the request
      * message type.
      * </pre>
@@ -3054,7 +2983,6 @@ public com.google.protobuf.ByteString getBodyBytes() {
      * The name of the request field whose value is mapped to the HTTP request
      * body, or `*` for mapping all request fields not captured by the path
      * pattern to the HTTP body, or omitted for not having any HTTP request body.
-     *
      * NOTE: the referred field must be present at the top-level of the request
      * message type.
      * </pre>
@@ -3080,7 +3008,6 @@ public Builder setBody(java.lang.String value) {
      * The name of the request field whose value is mapped to the HTTP request
      * body, or `*` for mapping all request fields not captured by the path
      * pattern to the HTTP body, or omitted for not having any HTTP request body.
-     *
      * NOTE: the referred field must be present at the top-level of the request
      * message type.
      * </pre>
@@ -3102,7 +3029,6 @@ public Builder clearBody() {
      * The name of the request field whose value is mapped to the HTTP request
      * body, or `*` for mapping all request fields not captured by the path
      * pattern to the HTTP body, or omitted for not having any HTTP request body.
-     *
      * NOTE: the referred field must be present at the top-level of the request
      * message type.
      * </pre>
@@ -3131,7 +3057,6 @@ public Builder setBodyBytes(com.google.protobuf.ByteString value) {
      * Optional. The name of the response field whose value is mapped to the HTTP
      * response body. When omitted, the entire response message will be used
      * as the HTTP response body.
-     *
      * NOTE: The referred field must be present at the top-level of the response
      * message type.
      * </pre>
@@ -3158,7 +3083,6 @@ public java.lang.String getResponseBody() {
      * Optional. The name of the response field whose value is mapped to the HTTP
      * response body. When omitted, the entire response message will be used
      * as the HTTP response body.
-     *
      * NOTE: The referred field must be present at the top-level of the response
      * message type.
      * </pre>
@@ -3185,7 +3109,6 @@ public com.google.protobuf.ByteString getResponseBodyBytes() {
      * Optional. The name of the response field whose value is mapped to the HTTP
      * response body. When omitted, the entire response message will be used
      * as the HTTP response body.
-     *
      * NOTE: The referred field must be present at the top-level of the response
      * message type.
      * </pre>
@@ -3211,7 +3134,6 @@ public Builder setResponseBody(java.lang.String value) {
      * Optional. The name of the response field whose value is mapped to the HTTP
      * response body. When omitted, the entire response message will be used
      * as the HTTP response body.
-     *
      * NOTE: The referred field must be present at the top-level of the response
      * message type.
      * </pre>
@@ -3233,7 +3155,6 @@ public Builder clearResponseBody() {
      * Optional. The name of the response field whose value is mapped to the HTTP
      * response body. When omitted, the entire response message will be used
      * as the HTTP response body.
-     *
      * NOTE: The referred field must be present at the top-level of the response
      * message type.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRuleOrBuilder.java
index 56b7fa79c9..31d51732f2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpRuleOrBuilder.java
@@ -28,7 +28,6 @@ public interface HttpRuleOrBuilder
    *
    * <pre>
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -43,7 +42,6 @@ public interface HttpRuleOrBuilder
    *
    * <pre>
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -293,7 +291,6 @@ public interface HttpRuleOrBuilder
    * The name of the request field whose value is mapped to the HTTP request
    * body, or `*` for mapping all request fields not captured by the path
    * pattern to the HTTP body, or omitted for not having any HTTP request body.
-   *
    * NOTE: the referred field must be present at the top-level of the request
    * message type.
    * </pre>
@@ -310,7 +307,6 @@ public interface HttpRuleOrBuilder
    * The name of the request field whose value is mapped to the HTTP request
    * body, or `*` for mapping all request fields not captured by the path
    * pattern to the HTTP body, or omitted for not having any HTTP request body.
-   *
    * NOTE: the referred field must be present at the top-level of the request
    * message type.
    * </pre>
@@ -328,7 +324,6 @@ public interface HttpRuleOrBuilder
    * Optional. The name of the response field whose value is mapped to the HTTP
    * response body. When omitted, the entire response message will be used
    * as the HTTP response body.
-   *
    * NOTE: The referred field must be present at the top-level of the response
    * message type.
    * </pre>
@@ -345,7 +340,6 @@ public interface HttpRuleOrBuilder
    * Optional. The name of the response field whose value is mapped to the HTTP
    * response body. When omitted, the entire response message will be used
    * as the HTTP response body.
-   *
    * NOTE: The referred field must be present at the top-level of the response
    * message type.
    * </pre>
@@ -417,5 +411,5 @@ public interface HttpRuleOrBuilder
    */
   com.google.api.HttpRuleOrBuilder getAdditionalBindingsOrBuilder(int index);
 
-  com.google.api.HttpRule.PatternCase getPatternCase();
+  public com.google.api.HttpRule.PatternCase getPatternCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettings.java
index 7654daf0d9..4bdbc32ad2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettings.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new JavaSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_JavaSettings_descriptor;
   }
@@ -83,9 +88,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * who have already set the language_settings.java.package_name" field
    * in gapic.yaml. API teams should use the protobuf java_package option
    * where possible.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      library_package: com.google.cloud.pubsub.v1
@@ -116,9 +119,7 @@ public java.lang.String getLibraryPackage() {
    * who have already set the language_settings.java.package_name" field
    * in gapic.yaml. API teams should use the protobuf java_package option
    * where possible.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      library_package: com.google.cloud.pubsub.v1
@@ -179,9 +180,7 @@ public int getServiceClassNamesCount() {
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -214,9 +213,7 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNames()
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -240,9 +237,7 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNamesMap
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -273,9 +268,7 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNamesMap
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -643,6 +636,39 @@ private void buildPartial0(com.google.api.JavaSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.JavaSettings) {
@@ -745,9 +771,7 @@ public Builder mergeFrom(
      * who have already set the language_settings.java.package_name" field
      * in gapic.yaml. API teams should use the protobuf java_package option
      * where possible.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      library_package: com.google.cloud.pubsub.v1
@@ -777,9 +801,7 @@ public java.lang.String getLibraryPackage() {
      * who have already set the language_settings.java.package_name" field
      * in gapic.yaml. API teams should use the protobuf java_package option
      * where possible.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      library_package: com.google.cloud.pubsub.v1
@@ -809,9 +831,7 @@ public com.google.protobuf.ByteString getLibraryPackageBytes() {
      * who have already set the language_settings.java.package_name" field
      * in gapic.yaml. API teams should use the protobuf java_package option
      * where possible.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      library_package: com.google.cloud.pubsub.v1
@@ -840,9 +860,7 @@ public Builder setLibraryPackage(java.lang.String value) {
      * who have already set the language_settings.java.package_name" field
      * in gapic.yaml. API teams should use the protobuf java_package option
      * where possible.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      library_package: com.google.cloud.pubsub.v1
@@ -867,9 +885,7 @@ public Builder clearLibraryPackage() {
      * who have already set the language_settings.java.package_name" field
      * in gapic.yaml. API teams should use the protobuf java_package option
      * where possible.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      library_package: com.google.cloud.pubsub.v1
@@ -930,9 +946,7 @@ public int getServiceClassNamesCount() {
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
@@ -965,9 +979,7 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNames()
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
@@ -991,9 +1003,7 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNamesMap
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
@@ -1025,9 +1035,7 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNamesMap
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
@@ -1065,9 +1073,7 @@ public Builder clearServiceClassNames() {
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
@@ -1100,9 +1106,7 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableServiceClassN
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
@@ -1133,9 +1137,7 @@ public Builder putServiceClassNames(java.lang.String key, java.lang.String value
      * the language_settings.java.interface_names" field in gapic.yaml. API
      * teams should otherwise use the service name as it appears in the
      * protobuf.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    java_settings:
      *      service_class_names:
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettingsOrBuilder.java
index 72a860c07e..c6d326f4a3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettingsOrBuilder.java
@@ -32,9 +32,7 @@ public interface JavaSettingsOrBuilder
    * who have already set the language_settings.java.package_name" field
    * in gapic.yaml. API teams should use the protobuf java_package option
    * where possible.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      library_package: com.google.cloud.pubsub.v1
@@ -54,9 +52,7 @@ public interface JavaSettingsOrBuilder
    * who have already set the language_settings.java.package_name" field
    * in gapic.yaml. API teams should use the protobuf java_package option
    * where possible.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      library_package: com.google.cloud.pubsub.v1
@@ -78,9 +74,7 @@ public interface JavaSettingsOrBuilder
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -101,9 +95,7 @@ public interface JavaSettingsOrBuilder
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -127,9 +119,7 @@ public interface JavaSettingsOrBuilder
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -150,9 +140,7 @@ public interface JavaSettingsOrBuilder
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
@@ -177,9 +165,7 @@ java.lang.String getServiceClassNamesOrDefault(
    * the language_settings.java.interface_names" field in gapic.yaml. API
    * teams should otherwise use the service name as it appears in the
    * protobuf.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    java_settings:
    *      service_class_names:
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java
index d81e325fed..9e7968ed34 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new JwtLocation();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_JwtLocation_descriptor;
   }
@@ -60,8 +65,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int inCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object in_;
 
   public enum InCase
@@ -334,7 +337,6 @@ public com.google.protobuf.ByteString getCookieBytes() {
    * If not empty, the header value has to match (case sensitive) this prefix.
    * If not matched, JWT will not be extracted. If matched, JWT will be
    * extracted after the prefix is removed.
-   *
    * For example, for "Authorization: Bearer {JWT}",
    * value_prefix="Bearer " with a space at the end.
    * </pre>
@@ -364,7 +366,6 @@ public java.lang.String getValuePrefix() {
    * If not empty, the header value has to match (case sensitive) this prefix.
    * If not matched, JWT will not be extracted. If matched, JWT will be
    * extracted after the prefix is removed.
-   *
    * For example, for "Authorization: Bearer {JWT}",
    * value_prefix="Bearer " with a space at the end.
    * </pre>
@@ -675,6 +676,39 @@ private void buildPartialOneofs(com.google.api.JwtLocation result) {
       result.in_ = this.in_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.JwtLocation) {
@@ -1217,7 +1251,6 @@ public Builder setCookieBytes(com.google.protobuf.ByteString value) {
      * If not empty, the header value has to match (case sensitive) this prefix.
      * If not matched, JWT will not be extracted. If matched, JWT will be
      * extracted after the prefix is removed.
-     *
      * For example, for "Authorization: Bearer {JWT}",
      * value_prefix="Bearer " with a space at the end.
      * </pre>
@@ -1246,7 +1279,6 @@ public java.lang.String getValuePrefix() {
      * If not empty, the header value has to match (case sensitive) this prefix.
      * If not matched, JWT will not be extracted. If matched, JWT will be
      * extracted after the prefix is removed.
-     *
      * For example, for "Authorization: Bearer {JWT}",
      * value_prefix="Bearer " with a space at the end.
      * </pre>
@@ -1275,7 +1307,6 @@ public com.google.protobuf.ByteString getValuePrefixBytes() {
      * If not empty, the header value has to match (case sensitive) this prefix.
      * If not matched, JWT will not be extracted. If matched, JWT will be
      * extracted after the prefix is removed.
-     *
      * For example, for "Authorization: Bearer {JWT}",
      * value_prefix="Bearer " with a space at the end.
      * </pre>
@@ -1303,7 +1334,6 @@ public Builder setValuePrefix(java.lang.String value) {
      * If not empty, the header value has to match (case sensitive) this prefix.
      * If not matched, JWT will not be extracted. If matched, JWT will be
      * extracted after the prefix is removed.
-     *
      * For example, for "Authorization: Bearer {JWT}",
      * value_prefix="Bearer " with a space at the end.
      * </pre>
@@ -1327,7 +1357,6 @@ public Builder clearValuePrefix() {
      * If not empty, the header value has to match (case sensitive) this prefix.
      * If not matched, JWT will not be extracted. If matched, JWT will be
      * extracted after the prefix is removed.
-     *
      * For example, for "Authorization: Bearer {JWT}",
      * value_prefix="Bearer " with a space at the end.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocationOrBuilder.java
index cd6fff9f5b..167a5c86e6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocationOrBuilder.java
@@ -143,7 +143,6 @@ public interface JwtLocationOrBuilder
    * If not empty, the header value has to match (case sensitive) this prefix.
    * If not matched, JWT will not be extracted. If matched, JWT will be
    * extracted after the prefix is removed.
-   *
    * For example, for "Authorization: Bearer {JWT}",
    * value_prefix="Bearer " with a space at the end.
    * </pre>
@@ -162,7 +161,6 @@ public interface JwtLocationOrBuilder
    * If not empty, the header value has to match (case sensitive) this prefix.
    * If not matched, JWT will not be extracted. If matched, JWT will be
    * extracted after the prefix is removed.
-   *
    * For example, for "Authorization: Bearer {JWT}",
    * value_prefix="Bearer " with a space at the end.
    * </pre>
@@ -173,5 +171,5 @@ public interface JwtLocationOrBuilder
    */
   com.google.protobuf.ByteString getValuePrefixBytes();
 
-  com.google.api.JwtLocation.InCase getInCase();
+  public com.google.api.JwtLocation.InCase getInCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
index 071ca4609a..503d6fc0d8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new LabelDescriptor();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_descriptor;
   }
@@ -614,6 +619,39 @@ private void buildPartial0(com.google.api.LabelDescriptor result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.LabelDescriptor) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
index ae0f97dfa3..b6b3318518 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
@@ -23,7 +23,6 @@
  *
  * <pre>
  * A description of a log type. Example in YAML format:
- *
  *     - name: library.googleapis.com/activity_history
  *       description: The history of borrowing and returning library items.
  *       display_name: Activity
@@ -57,6 +56,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new LogDescriptor();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.LogProto.internal_static_google_api_LogDescriptor_descriptor;
   }
@@ -504,7 +508,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * A description of a log type. Example in YAML format:
-   *
    *     - name: library.googleapis.com/activity_history
    *       description: The history of borrowing and returning library items.
    *       display_name: Activity
@@ -610,6 +613,39 @@ private void buildPartial0(com.google.api.LogDescriptor result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.LogDescriptor) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Logging.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Logging.java
index 3d0268a67d..26cf4b48d7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Logging.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Logging.java
@@ -23,12 +23,10 @@
  *
  * <pre>
  * Logging configuration of the service.
- *
  * The following example shows how to configure logs to be sent to the
  * producer and consumer projects. In the example, the `activity_history`
  * log is sent to both the producer and consumer projects, whereas the
  * `purchase_history` log is only sent to the producer project.
- *
  *     monitored_resources:
  *     - type: library.googleapis.com/branch
  *       labels:
@@ -76,6 +74,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Logging();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.LoggingProto.internal_static_google_api_Logging_descriptor;
   }
@@ -207,7 +210,7 @@ private LoggingDestination(com.google.protobuf.GeneratedMessageV3.Builder<?> bui
 
     private LoggingDestination() {
       monitoredResource_ = "";
-      logs_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      logs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -216,6 +219,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new LoggingDestination();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.LoggingProto
           .internal_static_google_api_Logging_LoggingDestination_descriptor;
@@ -289,8 +297,7 @@ public com.google.protobuf.ByteString getMonitoredResourceBytes() {
     public static final int LOGS_FIELD_NUMBER = 1;
 
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList logs_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList logs_;
     /**
      *
      *
@@ -580,7 +587,8 @@ public Builder clear() {
         super.clear();
         bitField0_ = 0;
         monitoredResource_ = "";
-        logs_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        logs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -608,6 +616,7 @@ public com.google.api.Logging.LoggingDestination build() {
       public com.google.api.Logging.LoggingDestination buildPartial() {
         com.google.api.Logging.LoggingDestination result =
             new com.google.api.Logging.LoggingDestination(this);
+        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) {
           buildPartial0(result);
         }
@@ -615,15 +624,54 @@ public com.google.api.Logging.LoggingDestination buildPartial() {
         return result;
       }
 
+      private void buildPartialRepeatedFields(com.google.api.Logging.LoggingDestination result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          logs_ = logs_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.logs_ = logs_;
+      }
+
       private void buildPartial0(com.google.api.Logging.LoggingDestination result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.monitoredResource_ = monitoredResource_;
         }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          logs_.makeImmutable();
-          result.logs_ = logs_;
-        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -646,7 +694,7 @@ public Builder mergeFrom(com.google.api.Logging.LoggingDestination other) {
         if (!other.logs_.isEmpty()) {
           if (logs_.isEmpty()) {
             logs_ = other.logs_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureLogsIsMutable();
             logs_.addAll(other.logs_);
@@ -827,14 +875,14 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList logs_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      private com.google.protobuf.LazyStringList logs_ =
+          com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureLogsIsMutable() {
-        if (!logs_.isModifiable()) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           logs_ = new com.google.protobuf.LazyStringArrayList(logs_);
+          bitField0_ |= 0x00000002;
         }
-        bitField0_ |= 0x00000002;
       }
       /**
        *
@@ -851,8 +899,7 @@ private void ensureLogsIsMutable() {
        * @return A list containing the logs.
        */
       public com.google.protobuf.ProtocolStringList getLogsList() {
-        logs_.makeImmutable();
-        return logs_;
+        return logs_.getUnmodifiableView();
       }
       /**
        *
@@ -929,7 +976,6 @@ public Builder setLogs(int index, java.lang.String value) {
         }
         ensureLogsIsMutable();
         logs_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -954,7 +1000,6 @@ public Builder addLogs(java.lang.String value) {
         }
         ensureLogsIsMutable();
         logs_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -976,7 +1021,6 @@ public Builder addLogs(java.lang.String value) {
       public Builder addAllLogs(java.lang.Iterable<java.lang.String> values) {
         ensureLogsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, logs_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -995,9 +1039,8 @@ public Builder addAllLogs(java.lang.Iterable<java.lang.String> values) {
        * @return This builder for chaining.
        */
       public Builder clearLogs() {
-        logs_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        logs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        ;
         onChanged();
         return this;
       }
@@ -1023,7 +1066,6 @@ public Builder addLogsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureLogsIsMutable();
         logs_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1443,12 +1485,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Logging configuration of the service.
-   *
    * The following example shows how to configure logs to be sent to the
    * producer and consumer projects. In the example, the `activity_history`
    * log is sent to both the producer and consumer projects, whereas the
    * `purchase_history` log is only sent to the producer project.
-   *
    *     monitored_resources:
    *     - type: library.googleapis.com/branch
    *       labels:
@@ -1574,6 +1614,39 @@ private void buildPartial0(com.google.api.Logging result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Logging) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettings.java
index 97e394223e..bbfec42322 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettings.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MethodSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_MethodSettings_descriptor;
   }
@@ -201,7 +206,7 @@ public interface LongRunningOrBuilder
    * long-running operation pattern.
    * All default values below are from those used in the client library
    * generators (e.g.
-   * [Java](https://github.com/googleapis/gapic-generator-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
+   * [Java](https://github.com/googleapis/sdk-platform-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
    * </pre>
    *
    * Protobuf type {@code google.api.MethodSettings.LongRunning}
@@ -224,6 +229,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new LongRunning();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.ClientProto
           .internal_static_google_api_MethodSettings_LongRunning_descriptor;
@@ -629,7 +639,7 @@ protected Builder newBuilderForType(
      * long-running operation pattern.
      * All default values below are from those used in the client library
      * generators (e.g.
-     * [Java](https://github.com/googleapis/gapic-generator-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
+     * [Java](https://github.com/googleapis/sdk-platform-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
      * </pre>
      *
      * Protobuf type {@code google.api.MethodSettings.LongRunning}
@@ -738,6 +748,41 @@ private void buildPartial0(com.google.api.MethodSettings.LongRunning result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.MethodSettings.LongRunning) {
@@ -1594,9 +1639,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
    * Describes settings to use for long-running operations when generating
    * API methods for RPCs. Complements RPCs that use the annotations in
    * google/longrunning/operations.proto.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    method_settings:
    *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -1625,9 +1668,7 @@ public boolean hasLongRunning() {
    * Describes settings to use for long-running operations when generating
    * API methods for RPCs. Complements RPCs that use the annotations in
    * google/longrunning/operations.proto.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    method_settings:
    *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -1658,9 +1699,7 @@ public com.google.api.MethodSettings.LongRunning getLongRunning() {
    * Describes settings to use for long-running operations when generating
    * API methods for RPCs. Complements RPCs that use the annotations in
    * google/longrunning/operations.proto.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    method_settings:
    *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -1939,6 +1978,39 @@ private void buildPartial0(com.google.api.MethodSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MethodSettings) {
@@ -2140,9 +2212,7 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2170,9 +2240,7 @@ public boolean hasLongRunning() {
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2206,9 +2274,7 @@ public com.google.api.MethodSettings.LongRunning getLongRunning() {
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2244,9 +2310,7 @@ public Builder setLongRunning(com.google.api.MethodSettings.LongRunning value) {
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2280,9 +2344,7 @@ public Builder setLongRunning(
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2321,9 +2383,7 @@ public Builder mergeLongRunning(com.google.api.MethodSettings.LongRunning value)
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2356,9 +2416,7 @@ public Builder clearLongRunning() {
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2386,9 +2444,7 @@ public com.google.api.MethodSettings.LongRunning.Builder getLongRunningBuilder()
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -2420,9 +2476,7 @@ public com.google.api.MethodSettings.LongRunningOrBuilder getLongRunningOrBuilde
      * Describes settings to use for long-running operations when generating
      * API methods for RPCs. Complements RPCs that use the annotations in
      * google/longrunning/operations.proto.
-     *
      * Example of a YAML configuration::
-     *
      *  publishing:
      *    method_settings:
      *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettingsOrBuilder.java
index bd505c8f47..9bc4f14caa 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodSettingsOrBuilder.java
@@ -57,9 +57,7 @@ public interface MethodSettingsOrBuilder
    * Describes settings to use for long-running operations when generating
    * API methods for RPCs. Complements RPCs that use the annotations in
    * google/longrunning/operations.proto.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    method_settings:
    *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -85,9 +83,7 @@ public interface MethodSettingsOrBuilder
    * Describes settings to use for long-running operations when generating
    * API methods for RPCs. Complements RPCs that use the annotations in
    * google/longrunning/operations.proto.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    method_settings:
    *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
@@ -113,9 +109,7 @@ public interface MethodSettingsOrBuilder
    * Describes settings to use for long-running operations when generating
    * API methods for RPCs. Complements RPCs that use the annotations in
    * google/longrunning/operations.proto.
-   *
    * Example of a YAML configuration::
-   *
    *  publishing:
    *    method_settings:
    *      - selector: google.cloud.speech.v2.Speech.BatchRecognize
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Metric.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Metric.java
index 2215b4907f..95d806a9e9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Metric.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Metric.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Metric();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MetricProto.internal_static_google_api_Metric_descriptor;
   }
@@ -507,6 +512,39 @@ private void buildPartial0(com.google.api.Metric result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Metric) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java
index 62054e4be8..f39ceed755 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java
@@ -49,7 +49,7 @@ private MetricDescriptor() {
     description_ = "";
     displayName_ = "";
     launchStage_ = 0;
-    monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -58,6 +58,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MetricDescriptor();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_descriptor;
   }
@@ -662,6 +667,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new MetricDescriptorMetadata();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.MetricProto
           .internal_static_google_api_MetricDescriptor_MetricDescriptorMetadata_descriptor;
@@ -1125,6 +1135,41 @@ private void buildPartial0(com.google.api.MetricDescriptor.MetricDescriptorMetad
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.api.MetricDescriptor.MetricDescriptorMetadata) {
@@ -1862,7 +1907,6 @@ public com.google.protobuf.ByteString getNameBytes() {
    * URL-encoded. All user-defined metric types have the DNS name
    * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
    * use a natural hierarchical grouping. For example:
-   *
    *     "custom.googleapis.com/invoice/paid/amount"
    *     "external.googleapis.com/prometheus/up"
    *     "appengine.googleapis.com/http/server/response_latencies"
@@ -1892,7 +1936,6 @@ public java.lang.String getType() {
    * URL-encoded. All user-defined metric types have the DNS name
    * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
    * use a natural hierarchical grouping. For example:
-   *
    *     "custom.googleapis.com/invoice/paid/amount"
    *     "external.googleapis.com/prometheus/up"
    *     "appengine.googleapis.com/http/server/response_latencies"
@@ -2096,28 +2139,22 @@ public com.google.api.MetricDescriptor.ValueType getValueType() {
    * The units in which the metric value is reported. It is only applicable
    * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
    * defines the representation of the stored metric values.
-   *
    * Different systems might scale the values to be more easily displayed (so a
    * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
    * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
    * `kBy`, then the value of the metric is always in thousands of bytes, no
    * matter how it might be displayed.
-   *
    * If you want a custom metric to record the exact number of CPU-seconds used
    * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
    * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
    * CPU-seconds, then the value is written as `12005`.
-   *
    * Alternatively, if you want a custom metric to record data in a more
    * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
    * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
    * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-   *
    * The supported units are a subset of [The Unified Code for Units of
    * Measure](https://unitsofmeasure.org/ucum.html) standard:
-   *
    * **Basic units (UNIT)**
-   *
    * * `bit`   bit
    * * `By`    byte
    * * `s`     second
@@ -2125,9 +2162,7 @@ public com.google.api.MetricDescriptor.ValueType getValueType() {
    * * `h`     hour
    * * `d`     day
    * * `1`     dimensionless
-   *
    * **Prefixes (PREFIX)**
-   *
    * * `k`     kilo    (10^3)
    * * `M`     mega    (10^6)
    * * `G`     giga    (10^9)
@@ -2136,7 +2171,6 @@ public com.google.api.MetricDescriptor.ValueType getValueType() {
    * * `E`     exa     (10^18)
    * * `Z`     zetta   (10^21)
    * * `Y`     yotta   (10^24)
-   *
    * * `m`     milli   (10^-3)
    * * `u`     micro   (10^-6)
    * * `n`     nano    (10^-9)
@@ -2145,37 +2179,27 @@ public com.google.api.MetricDescriptor.ValueType getValueType() {
    * * `a`     atto    (10^-18)
    * * `z`     zepto   (10^-21)
    * * `y`     yocto   (10^-24)
-   *
    * * `Ki`    kibi    (2^10)
    * * `Mi`    mebi    (2^20)
    * * `Gi`    gibi    (2^30)
    * * `Ti`    tebi    (2^40)
    * * `Pi`    pebi    (2^50)
-   *
    * **Grammar**
-   *
    * The grammar also includes these connectors:
-   *
    * * `/`    division or ratio (as an infix operator). For examples,
    *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
    *          have `/s` in a metric `unit`; rates should always be computed at
    *          query time from the underlying cumulative or delta value).
    * * `.`    multiplication or composition (as an infix operator). For
    *          examples, `GBy.d` or `k{watt}.h`.
-   *
    * The grammar for a unit is as follows:
-   *
    *     Expression = Component { "." Component } { "/" Component } ;
-   *
    *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
    *               | Annotation
    *               | "1"
    *               ;
-   *
    *     Annotation = "{" NAME "}" ;
-   *
    * Notes:
-   *
    * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
    *    is used alone, then the unit is equivalent to `1`. For examples,
    *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -2220,28 +2244,22 @@ public java.lang.String getUnit() {
    * The units in which the metric value is reported. It is only applicable
    * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
    * defines the representation of the stored metric values.
-   *
    * Different systems might scale the values to be more easily displayed (so a
    * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
    * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
    * `kBy`, then the value of the metric is always in thousands of bytes, no
    * matter how it might be displayed.
-   *
    * If you want a custom metric to record the exact number of CPU-seconds used
    * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
    * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
    * CPU-seconds, then the value is written as `12005`.
-   *
    * Alternatively, if you want a custom metric to record data in a more
    * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
    * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
    * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-   *
    * The supported units are a subset of [The Unified Code for Units of
    * Measure](https://unitsofmeasure.org/ucum.html) standard:
-   *
    * **Basic units (UNIT)**
-   *
    * * `bit`   bit
    * * `By`    byte
    * * `s`     second
@@ -2249,9 +2267,7 @@ public java.lang.String getUnit() {
    * * `h`     hour
    * * `d`     day
    * * `1`     dimensionless
-   *
    * **Prefixes (PREFIX)**
-   *
    * * `k`     kilo    (10^3)
    * * `M`     mega    (10^6)
    * * `G`     giga    (10^9)
@@ -2260,7 +2276,6 @@ public java.lang.String getUnit() {
    * * `E`     exa     (10^18)
    * * `Z`     zetta   (10^21)
    * * `Y`     yotta   (10^24)
-   *
    * * `m`     milli   (10^-3)
    * * `u`     micro   (10^-6)
    * * `n`     nano    (10^-9)
@@ -2269,37 +2284,27 @@ public java.lang.String getUnit() {
    * * `a`     atto    (10^-18)
    * * `z`     zepto   (10^-21)
    * * `y`     yocto   (10^-24)
-   *
    * * `Ki`    kibi    (2^10)
    * * `Mi`    mebi    (2^20)
    * * `Gi`    gibi    (2^30)
    * * `Ti`    tebi    (2^40)
    * * `Pi`    pebi    (2^50)
-   *
    * **Grammar**
-   *
    * The grammar also includes these connectors:
-   *
    * * `/`    division or ratio (as an infix operator). For examples,
    *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
    *          have `/s` in a metric `unit`; rates should always be computed at
    *          query time from the underlying cumulative or delta value).
    * * `.`    multiplication or composition (as an infix operator). For
    *          examples, `GBy.d` or `k{watt}.h`.
-   *
    * The grammar for a unit is as follows:
-   *
    *     Expression = Component { "." Component } { "/" Component } ;
-   *
    *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
    *               | Annotation
    *               | "1"
    *               ;
-   *
    *     Annotation = "{" NAME "}" ;
-   *
    * Notes:
-   *
    * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
    *    is used alone, then the unit is equivalent to `1`. For examples,
    *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -2533,8 +2538,7 @@ public com.google.api.LaunchStage getLaunchStage() {
   public static final int MONITORED_RESOURCE_TYPES_FIELD_NUMBER = 13;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList monitoredResourceTypes_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList monitoredResourceTypes_;
   /**
    *
    *
@@ -2940,7 +2944,8 @@ public Builder clear() {
         metadataBuilder_ = null;
       }
       launchStage_ = 0;
-      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000400);
       return this;
     }
 
@@ -2984,6 +2989,11 @@ private void buildPartialRepeatedFields(com.google.api.MetricDescriptor result)
       } else {
         result.labels_ = labelsBuilder_.build();
       }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        monitoredResourceTypes_ = monitoredResourceTypes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000400);
+      }
+      result.monitoredResourceTypes_ = monitoredResourceTypes_;
     }
 
     private void buildPartial0(com.google.api.MetricDescriptor result) {
@@ -3015,10 +3025,39 @@ private void buildPartial0(com.google.api.MetricDescriptor result) {
       if (((from_bitField0_ & 0x00000200) != 0)) {
         result.launchStage_ = launchStage_;
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        monitoredResourceTypes_.makeImmutable();
-        result.monitoredResourceTypes_ = monitoredResourceTypes_;
-      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -3100,7 +3139,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
       if (!other.monitoredResourceTypes_.isEmpty()) {
         if (monitoredResourceTypes_.isEmpty()) {
           monitoredResourceTypes_ = other.monitoredResourceTypes_;
-          bitField0_ |= 0x00000400;
+          bitField0_ = (bitField0_ & ~0x00000400);
         } else {
           ensureMonitoredResourceTypesIsMutable();
           monitoredResourceTypes_.addAll(other.monitoredResourceTypes_);
@@ -3340,7 +3379,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * URL-encoded. All user-defined metric types have the DNS name
      * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
      * use a natural hierarchical grouping. For example:
-     *
      *     "custom.googleapis.com/invoice/paid/amount"
      *     "external.googleapis.com/prometheus/up"
      *     "appengine.googleapis.com/http/server/response_latencies"
@@ -3369,7 +3407,6 @@ public java.lang.String getType() {
      * URL-encoded. All user-defined metric types have the DNS name
      * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
      * use a natural hierarchical grouping. For example:
-     *
      *     "custom.googleapis.com/invoice/paid/amount"
      *     "external.googleapis.com/prometheus/up"
      *     "appengine.googleapis.com/http/server/response_latencies"
@@ -3398,7 +3435,6 @@ public com.google.protobuf.ByteString getTypeBytes() {
      * URL-encoded. All user-defined metric types have the DNS name
      * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
      * use a natural hierarchical grouping. For example:
-     *
      *     "custom.googleapis.com/invoice/paid/amount"
      *     "external.googleapis.com/prometheus/up"
      *     "appengine.googleapis.com/http/server/response_latencies"
@@ -3426,7 +3462,6 @@ public Builder setType(java.lang.String value) {
      * URL-encoded. All user-defined metric types have the DNS name
      * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
      * use a natural hierarchical grouping. For example:
-     *
      *     "custom.googleapis.com/invoice/paid/amount"
      *     "external.googleapis.com/prometheus/up"
      *     "appengine.googleapis.com/http/server/response_latencies"
@@ -3450,7 +3485,6 @@ public Builder clearType() {
      * URL-encoded. All user-defined metric types have the DNS name
      * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
      * use a natural hierarchical grouping. For example:
-     *
      *     "custom.googleapis.com/invoice/paid/amount"
      *     "external.googleapis.com/prometheus/up"
      *     "appengine.googleapis.com/http/server/response_latencies"
@@ -4106,28 +4140,22 @@ public Builder clearValueType() {
      * The units in which the metric value is reported. It is only applicable
      * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
      * defines the representation of the stored metric values.
-     *
      * Different systems might scale the values to be more easily displayed (so a
      * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
      * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
      * `kBy`, then the value of the metric is always in thousands of bytes, no
      * matter how it might be displayed.
-     *
      * If you want a custom metric to record the exact number of CPU-seconds used
      * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
      * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
      * CPU-seconds, then the value is written as `12005`.
-     *
      * Alternatively, if you want a custom metric to record data in a more
      * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
      * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
      * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-     *
      * The supported units are a subset of [The Unified Code for Units of
      * Measure](https://unitsofmeasure.org/ucum.html) standard:
-     *
      * **Basic units (UNIT)**
-     *
      * * `bit`   bit
      * * `By`    byte
      * * `s`     second
@@ -4135,9 +4163,7 @@ public Builder clearValueType() {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -4146,7 +4172,6 @@ public Builder clearValueType() {
      * * `E`     exa     (10^18)
      * * `Z`     zetta   (10^21)
      * * `Y`     yotta   (10^24)
-     *
      * * `m`     milli   (10^-3)
      * * `u`     micro   (10^-6)
      * * `n`     nano    (10^-9)
@@ -4155,37 +4180,27 @@ public Builder clearValueType() {
      * * `a`     atto    (10^-18)
      * * `z`     zepto   (10^-21)
      * * `y`     yocto   (10^-24)
-     *
      * * `Ki`    kibi    (2^10)
      * * `Mi`    mebi    (2^20)
      * * `Gi`    gibi    (2^30)
      * * `Ti`    tebi    (2^40)
      * * `Pi`    pebi    (2^50)
-     *
      * **Grammar**
-     *
      * The grammar also includes these connectors:
-     *
      * * `/`    division or ratio (as an infix operator). For examples,
      *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
      *          have `/s` in a metric `unit`; rates should always be computed at
      *          query time from the underlying cumulative or delta value).
      * * `.`    multiplication or composition (as an infix operator). For
      *          examples, `GBy.d` or `k{watt}.h`.
-     *
      * The grammar for a unit is as follows:
-     *
      *     Expression = Component { "." Component } { "/" Component } ;
-     *
      *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
      *               | Annotation
      *               | "1"
      *               ;
-     *
      *     Annotation = "{" NAME "}" ;
-     *
      * Notes:
-     *
      * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
      *    is used alone, then the unit is equivalent to `1`. For examples,
      *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -4229,28 +4244,22 @@ public java.lang.String getUnit() {
      * The units in which the metric value is reported. It is only applicable
      * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
      * defines the representation of the stored metric values.
-     *
      * Different systems might scale the values to be more easily displayed (so a
      * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
      * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
      * `kBy`, then the value of the metric is always in thousands of bytes, no
      * matter how it might be displayed.
-     *
      * If you want a custom metric to record the exact number of CPU-seconds used
      * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
      * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
      * CPU-seconds, then the value is written as `12005`.
-     *
      * Alternatively, if you want a custom metric to record data in a more
      * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
      * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
      * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-     *
      * The supported units are a subset of [The Unified Code for Units of
      * Measure](https://unitsofmeasure.org/ucum.html) standard:
-     *
      * **Basic units (UNIT)**
-     *
      * * `bit`   bit
      * * `By`    byte
      * * `s`     second
@@ -4258,9 +4267,7 @@ public java.lang.String getUnit() {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -4269,7 +4276,6 @@ public java.lang.String getUnit() {
      * * `E`     exa     (10^18)
      * * `Z`     zetta   (10^21)
      * * `Y`     yotta   (10^24)
-     *
      * * `m`     milli   (10^-3)
      * * `u`     micro   (10^-6)
      * * `n`     nano    (10^-9)
@@ -4278,37 +4284,27 @@ public java.lang.String getUnit() {
      * * `a`     atto    (10^-18)
      * * `z`     zepto   (10^-21)
      * * `y`     yocto   (10^-24)
-     *
      * * `Ki`    kibi    (2^10)
      * * `Mi`    mebi    (2^20)
      * * `Gi`    gibi    (2^30)
      * * `Ti`    tebi    (2^40)
      * * `Pi`    pebi    (2^50)
-     *
      * **Grammar**
-     *
      * The grammar also includes these connectors:
-     *
      * * `/`    division or ratio (as an infix operator). For examples,
      *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
      *          have `/s` in a metric `unit`; rates should always be computed at
      *          query time from the underlying cumulative or delta value).
      * * `.`    multiplication or composition (as an infix operator). For
      *          examples, `GBy.d` or `k{watt}.h`.
-     *
      * The grammar for a unit is as follows:
-     *
      *     Expression = Component { "." Component } { "/" Component } ;
-     *
      *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
      *               | Annotation
      *               | "1"
      *               ;
-     *
      *     Annotation = "{" NAME "}" ;
-     *
      * Notes:
-     *
      * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
      *    is used alone, then the unit is equivalent to `1`. For examples,
      *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -4352,28 +4348,22 @@ public com.google.protobuf.ByteString getUnitBytes() {
      * The units in which the metric value is reported. It is only applicable
      * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
      * defines the representation of the stored metric values.
-     *
      * Different systems might scale the values to be more easily displayed (so a
      * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
      * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
      * `kBy`, then the value of the metric is always in thousands of bytes, no
      * matter how it might be displayed.
-     *
      * If you want a custom metric to record the exact number of CPU-seconds used
      * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
      * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
      * CPU-seconds, then the value is written as `12005`.
-     *
      * Alternatively, if you want a custom metric to record data in a more
      * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
      * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
      * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-     *
      * The supported units are a subset of [The Unified Code for Units of
      * Measure](https://unitsofmeasure.org/ucum.html) standard:
-     *
      * **Basic units (UNIT)**
-     *
      * * `bit`   bit
      * * `By`    byte
      * * `s`     second
@@ -4381,9 +4371,7 @@ public com.google.protobuf.ByteString getUnitBytes() {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -4392,7 +4380,6 @@ public com.google.protobuf.ByteString getUnitBytes() {
      * * `E`     exa     (10^18)
      * * `Z`     zetta   (10^21)
      * * `Y`     yotta   (10^24)
-     *
      * * `m`     milli   (10^-3)
      * * `u`     micro   (10^-6)
      * * `n`     nano    (10^-9)
@@ -4401,37 +4388,27 @@ public com.google.protobuf.ByteString getUnitBytes() {
      * * `a`     atto    (10^-18)
      * * `z`     zepto   (10^-21)
      * * `y`     yocto   (10^-24)
-     *
      * * `Ki`    kibi    (2^10)
      * * `Mi`    mebi    (2^20)
      * * `Gi`    gibi    (2^30)
      * * `Ti`    tebi    (2^40)
      * * `Pi`    pebi    (2^50)
-     *
      * **Grammar**
-     *
      * The grammar also includes these connectors:
-     *
      * * `/`    division or ratio (as an infix operator). For examples,
      *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
      *          have `/s` in a metric `unit`; rates should always be computed at
      *          query time from the underlying cumulative or delta value).
      * * `.`    multiplication or composition (as an infix operator). For
      *          examples, `GBy.d` or `k{watt}.h`.
-     *
      * The grammar for a unit is as follows:
-     *
      *     Expression = Component { "." Component } { "/" Component } ;
-     *
      *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
      *               | Annotation
      *               | "1"
      *               ;
-     *
      *     Annotation = "{" NAME "}" ;
-     *
      * Notes:
-     *
      * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
      *    is used alone, then the unit is equivalent to `1`. For examples,
      *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -4474,28 +4451,22 @@ public Builder setUnit(java.lang.String value) {
      * The units in which the metric value is reported. It is only applicable
      * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
      * defines the representation of the stored metric values.
-     *
      * Different systems might scale the values to be more easily displayed (so a
      * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
      * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
      * `kBy`, then the value of the metric is always in thousands of bytes, no
      * matter how it might be displayed.
-     *
      * If you want a custom metric to record the exact number of CPU-seconds used
      * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
      * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
      * CPU-seconds, then the value is written as `12005`.
-     *
      * Alternatively, if you want a custom metric to record data in a more
      * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
      * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
      * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-     *
      * The supported units are a subset of [The Unified Code for Units of
      * Measure](https://unitsofmeasure.org/ucum.html) standard:
-     *
      * **Basic units (UNIT)**
-     *
      * * `bit`   bit
      * * `By`    byte
      * * `s`     second
@@ -4503,9 +4474,7 @@ public Builder setUnit(java.lang.String value) {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -4514,7 +4483,6 @@ public Builder setUnit(java.lang.String value) {
      * * `E`     exa     (10^18)
      * * `Z`     zetta   (10^21)
      * * `Y`     yotta   (10^24)
-     *
      * * `m`     milli   (10^-3)
      * * `u`     micro   (10^-6)
      * * `n`     nano    (10^-9)
@@ -4523,37 +4491,27 @@ public Builder setUnit(java.lang.String value) {
      * * `a`     atto    (10^-18)
      * * `z`     zepto   (10^-21)
      * * `y`     yocto   (10^-24)
-     *
      * * `Ki`    kibi    (2^10)
      * * `Mi`    mebi    (2^20)
      * * `Gi`    gibi    (2^30)
      * * `Ti`    tebi    (2^40)
      * * `Pi`    pebi    (2^50)
-     *
      * **Grammar**
-     *
      * The grammar also includes these connectors:
-     *
      * * `/`    division or ratio (as an infix operator). For examples,
      *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
      *          have `/s` in a metric `unit`; rates should always be computed at
      *          query time from the underlying cumulative or delta value).
      * * `.`    multiplication or composition (as an infix operator). For
      *          examples, `GBy.d` or `k{watt}.h`.
-     *
      * The grammar for a unit is as follows:
-     *
      *     Expression = Component { "." Component } { "/" Component } ;
-     *
      *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
      *               | Annotation
      *               | "1"
      *               ;
-     *
      *     Annotation = "{" NAME "}" ;
-     *
      * Notes:
-     *
      * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
      *    is used alone, then the unit is equivalent to `1`. For examples,
      *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -4592,28 +4550,22 @@ public Builder clearUnit() {
      * The units in which the metric value is reported. It is only applicable
      * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
      * defines the representation of the stored metric values.
-     *
      * Different systems might scale the values to be more easily displayed (so a
      * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
      * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
      * `kBy`, then the value of the metric is always in thousands of bytes, no
      * matter how it might be displayed.
-     *
      * If you want a custom metric to record the exact number of CPU-seconds used
      * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
      * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
      * CPU-seconds, then the value is written as `12005`.
-     *
      * Alternatively, if you want a custom metric to record data in a more
      * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
      * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
      * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-     *
      * The supported units are a subset of [The Unified Code for Units of
      * Measure](https://unitsofmeasure.org/ucum.html) standard:
-     *
      * **Basic units (UNIT)**
-     *
      * * `bit`   bit
      * * `By`    byte
      * * `s`     second
@@ -4621,9 +4573,7 @@ public Builder clearUnit() {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -4632,7 +4582,6 @@ public Builder clearUnit() {
      * * `E`     exa     (10^18)
      * * `Z`     zetta   (10^21)
      * * `Y`     yotta   (10^24)
-     *
      * * `m`     milli   (10^-3)
      * * `u`     micro   (10^-6)
      * * `n`     nano    (10^-9)
@@ -4641,37 +4590,27 @@ public Builder clearUnit() {
      * * `a`     atto    (10^-18)
      * * `z`     zepto   (10^-21)
      * * `y`     yocto   (10^-24)
-     *
      * * `Ki`    kibi    (2^10)
      * * `Mi`    mebi    (2^20)
      * * `Gi`    gibi    (2^30)
      * * `Ti`    tebi    (2^40)
      * * `Pi`    pebi    (2^50)
-     *
      * **Grammar**
-     *
      * The grammar also includes these connectors:
-     *
      * * `/`    division or ratio (as an infix operator). For examples,
      *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
      *          have `/s` in a metric `unit`; rates should always be computed at
      *          query time from the underlying cumulative or delta value).
      * * `.`    multiplication or composition (as an infix operator). For
      *          examples, `GBy.d` or `k{watt}.h`.
-     *
      * The grammar for a unit is as follows:
-     *
      *     Expression = Component { "." Component } { "/" Component } ;
-     *
      *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
      *               | Annotation
      *               | "1"
      *               ;
-     *
      *     Annotation = "{" NAME "}" ;
-     *
      * Notes:
-     *
      * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
      *    is used alone, then the unit is equivalent to `1`. For examples,
      *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -5211,15 +5150,15 @@ public Builder clearLaunchStage() {
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList monitoredResourceTypes_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList monitoredResourceTypes_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureMonitoredResourceTypesIsMutable() {
-      if (!monitoredResourceTypes_.isModifiable()) {
+      if (!((bitField0_ & 0x00000400) != 0)) {
         monitoredResourceTypes_ =
             new com.google.protobuf.LazyStringArrayList(monitoredResourceTypes_);
+        bitField0_ |= 0x00000400;
       }
-      bitField0_ |= 0x00000400;
     }
     /**
      *
@@ -5238,8 +5177,7 @@ private void ensureMonitoredResourceTypesIsMutable() {
      * @return A list containing the monitoredResourceTypes.
      */
     public com.google.protobuf.ProtocolStringList getMonitoredResourceTypesList() {
-      monitoredResourceTypes_.makeImmutable();
-      return monitoredResourceTypes_;
+      return monitoredResourceTypes_.getUnmodifiableView();
     }
     /**
      *
@@ -5324,7 +5262,6 @@ public Builder setMonitoredResourceTypes(int index, java.lang.String value) {
       }
       ensureMonitoredResourceTypesIsMutable();
       monitoredResourceTypes_.set(index, value);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -5351,7 +5288,6 @@ public Builder addMonitoredResourceTypes(java.lang.String value) {
       }
       ensureMonitoredResourceTypesIsMutable();
       monitoredResourceTypes_.add(value);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -5375,7 +5311,6 @@ public Builder addMonitoredResourceTypes(java.lang.String value) {
     public Builder addAllMonitoredResourceTypes(java.lang.Iterable<java.lang.String> values) {
       ensureMonitoredResourceTypesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, monitoredResourceTypes_);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -5396,9 +5331,8 @@ public Builder addAllMonitoredResourceTypes(java.lang.Iterable<java.lang.String>
      * @return This builder for chaining.
      */
     public Builder clearMonitoredResourceTypes() {
-      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000400);
-      ;
       onChanged();
       return this;
     }
@@ -5426,7 +5360,6 @@ public Builder addMonitoredResourceTypesBytes(com.google.protobuf.ByteString val
       checkByteStringIsUtf8(value);
       ensureMonitoredResourceTypesIsMutable();
       monitoredResourceTypes_.add(value);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptorOrBuilder.java
index 0f949c13b0..e50bfaa62d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptorOrBuilder.java
@@ -56,7 +56,6 @@ public interface MetricDescriptorOrBuilder
    * URL-encoded. All user-defined metric types have the DNS name
    * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
    * use a natural hierarchical grouping. For example:
-   *
    *     "custom.googleapis.com/invoice/paid/amount"
    *     "external.googleapis.com/prometheus/up"
    *     "appengine.googleapis.com/http/server/response_latencies"
@@ -75,7 +74,6 @@ public interface MetricDescriptorOrBuilder
    * URL-encoded. All user-defined metric types have the DNS name
    * `custom.googleapis.com` or `external.googleapis.com`. Metric types should
    * use a natural hierarchical grouping. For example:
-   *
    *     "custom.googleapis.com/invoice/paid/amount"
    *     "external.googleapis.com/prometheus/up"
    *     "appengine.googleapis.com/http/server/response_latencies"
@@ -224,28 +222,22 @@ public interface MetricDescriptorOrBuilder
    * The units in which the metric value is reported. It is only applicable
    * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
    * defines the representation of the stored metric values.
-   *
    * Different systems might scale the values to be more easily displayed (so a
    * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
    * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
    * `kBy`, then the value of the metric is always in thousands of bytes, no
    * matter how it might be displayed.
-   *
    * If you want a custom metric to record the exact number of CPU-seconds used
    * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
    * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
    * CPU-seconds, then the value is written as `12005`.
-   *
    * Alternatively, if you want a custom metric to record data in a more
    * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
    * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
    * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-   *
    * The supported units are a subset of [The Unified Code for Units of
    * Measure](https://unitsofmeasure.org/ucum.html) standard:
-   *
    * **Basic units (UNIT)**
-   *
    * * `bit`   bit
    * * `By`    byte
    * * `s`     second
@@ -253,9 +245,7 @@ public interface MetricDescriptorOrBuilder
    * * `h`     hour
    * * `d`     day
    * * `1`     dimensionless
-   *
    * **Prefixes (PREFIX)**
-   *
    * * `k`     kilo    (10^3)
    * * `M`     mega    (10^6)
    * * `G`     giga    (10^9)
@@ -264,7 +254,6 @@ public interface MetricDescriptorOrBuilder
    * * `E`     exa     (10^18)
    * * `Z`     zetta   (10^21)
    * * `Y`     yotta   (10^24)
-   *
    * * `m`     milli   (10^-3)
    * * `u`     micro   (10^-6)
    * * `n`     nano    (10^-9)
@@ -273,37 +262,27 @@ public interface MetricDescriptorOrBuilder
    * * `a`     atto    (10^-18)
    * * `z`     zepto   (10^-21)
    * * `y`     yocto   (10^-24)
-   *
    * * `Ki`    kibi    (2^10)
    * * `Mi`    mebi    (2^20)
    * * `Gi`    gibi    (2^30)
    * * `Ti`    tebi    (2^40)
    * * `Pi`    pebi    (2^50)
-   *
    * **Grammar**
-   *
    * The grammar also includes these connectors:
-   *
    * * `/`    division or ratio (as an infix operator). For examples,
    *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
    *          have `/s` in a metric `unit`; rates should always be computed at
    *          query time from the underlying cumulative or delta value).
    * * `.`    multiplication or composition (as an infix operator). For
    *          examples, `GBy.d` or `k{watt}.h`.
-   *
    * The grammar for a unit is as follows:
-   *
    *     Expression = Component { "." Component } { "/" Component } ;
-   *
    *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
    *               | Annotation
    *               | "1"
    *               ;
-   *
    *     Annotation = "{" NAME "}" ;
-   *
    * Notes:
-   *
    * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
    *    is used alone, then the unit is equivalent to `1`. For examples,
    *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
@@ -337,28 +316,22 @@ public interface MetricDescriptorOrBuilder
    * The units in which the metric value is reported. It is only applicable
    * if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The `unit`
    * defines the representation of the stored metric values.
-   *
    * Different systems might scale the values to be more easily displayed (so a
    * value of `0.02kBy` _might_ be displayed as `20By`, and a value of
    * `3523kBy` _might_ be displayed as `3.5MBy`). However, if the `unit` is
    * `kBy`, then the value of the metric is always in thousands of bytes, no
    * matter how it might be displayed.
-   *
    * If you want a custom metric to record the exact number of CPU-seconds used
    * by a job, you can create an `INT64 CUMULATIVE` metric whose `unit` is
    * `s{CPU}` (or equivalently `1s{CPU}` or just `s`). If the job uses 12,005
    * CPU-seconds, then the value is written as `12005`.
-   *
    * Alternatively, if you want a custom metric to record data in a more
    * granular way, you can create a `DOUBLE CUMULATIVE` metric whose `unit` is
    * `ks{CPU}`, and then write the value `12.005` (which is `12005/1000`),
    * or use `Kis{CPU}` and write `11.723` (which is `12005/1024`).
-   *
    * The supported units are a subset of [The Unified Code for Units of
    * Measure](https://unitsofmeasure.org/ucum.html) standard:
-   *
    * **Basic units (UNIT)**
-   *
    * * `bit`   bit
    * * `By`    byte
    * * `s`     second
@@ -366,9 +339,7 @@ public interface MetricDescriptorOrBuilder
    * * `h`     hour
    * * `d`     day
    * * `1`     dimensionless
-   *
    * **Prefixes (PREFIX)**
-   *
    * * `k`     kilo    (10^3)
    * * `M`     mega    (10^6)
    * * `G`     giga    (10^9)
@@ -377,7 +348,6 @@ public interface MetricDescriptorOrBuilder
    * * `E`     exa     (10^18)
    * * `Z`     zetta   (10^21)
    * * `Y`     yotta   (10^24)
-   *
    * * `m`     milli   (10^-3)
    * * `u`     micro   (10^-6)
    * * `n`     nano    (10^-9)
@@ -386,37 +356,27 @@ public interface MetricDescriptorOrBuilder
    * * `a`     atto    (10^-18)
    * * `z`     zepto   (10^-21)
    * * `y`     yocto   (10^-24)
-   *
    * * `Ki`    kibi    (2^10)
    * * `Mi`    mebi    (2^20)
    * * `Gi`    gibi    (2^30)
    * * `Ti`    tebi    (2^40)
    * * `Pi`    pebi    (2^50)
-   *
    * **Grammar**
-   *
    * The grammar also includes these connectors:
-   *
    * * `/`    division or ratio (as an infix operator). For examples,
    *          `kBy/{email}` or `MiBy/10ms` (although you should almost never
    *          have `/s` in a metric `unit`; rates should always be computed at
    *          query time from the underlying cumulative or delta value).
    * * `.`    multiplication or composition (as an infix operator). For
    *          examples, `GBy.d` or `k{watt}.h`.
-   *
    * The grammar for a unit is as follows:
-   *
    *     Expression = Component { "." Component } { "/" Component } ;
-   *
    *     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
    *               | Annotation
    *               | "1"
    *               ;
-   *
    *     Annotation = "{" NAME "}" ;
-   *
    * Notes:
-   *
    * * `Annotation` is just a comment if it follows a `UNIT`. If the annotation
    *    is used alone, then the unit is equivalent to `1`. For examples,
    *    `{request}/s == 1/s`, `By{transmitted}/s == By/s`.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
index 81b1ffcaf1..1d858e3f3c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MetricRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.QuotaProto.internal_static_google_api_MetricRule_descriptor;
   }
@@ -80,7 +85,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -106,7 +110,6 @@ public java.lang.String getSelector() {
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -160,7 +163,6 @@ public int getMetricCostsCount() {
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -187,7 +189,6 @@ public java.util.Map<java.lang.String, java.lang.Long> getMetricCosts() {
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -205,7 +206,6 @@ public java.util.Map<java.lang.String, java.lang.Long> getMetricCostsMap() {
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -227,7 +227,6 @@ public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) {
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -523,6 +522,39 @@ private void buildPartial0(com.google.api.MetricRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MetricRule) {
@@ -611,7 +643,6 @@ public Builder mergeFrom(
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -636,7 +667,6 @@ public java.lang.String getSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -661,7 +691,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -685,7 +714,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -705,7 +733,6 @@ public Builder clearSelector() {
      *
      * <pre>
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -760,7 +787,6 @@ public int getMetricCostsCount() {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
@@ -787,7 +813,6 @@ public java.util.Map<java.lang.String, java.lang.Long> getMetricCosts() {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
@@ -805,7 +830,6 @@ public java.util.Map<java.lang.String, java.lang.Long> getMetricCostsMap() {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
@@ -827,7 +851,6 @@ public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
@@ -858,7 +881,6 @@ public Builder clearMetricCosts() {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
@@ -885,7 +907,6 @@ public java.util.Map<java.lang.String, java.lang.Long> getMutableMetricCosts() {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
@@ -908,7 +929,6 @@ public Builder putMetricCosts(java.lang.String key, long value) {
      * <pre>
      * Metrics to update when the selected methods are called, and the associated
      * cost applied to each metric.
-     *
      * The key of the map is the metric name, and the values are the amount
      * increased for the metric against which the quota limits are defined.
      * The value must not be negative.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRuleOrBuilder.java
index 5aaac1d9eb..4827435062 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRuleOrBuilder.java
@@ -28,7 +28,6 @@ public interface MetricRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -43,7 +42,6 @@ public interface MetricRuleOrBuilder
    *
    * <pre>
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -60,7 +58,6 @@ public interface MetricRuleOrBuilder
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -75,7 +72,6 @@ public interface MetricRuleOrBuilder
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -93,7 +89,6 @@ public interface MetricRuleOrBuilder
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -108,7 +103,6 @@ public interface MetricRuleOrBuilder
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
@@ -123,7 +117,6 @@ public interface MetricRuleOrBuilder
    * <pre>
    * Metrics to update when the selected methods are called, and the associated
    * cost applied to each metric.
-   *
    * The key of the map is the metric name, and the values are the amount
    * increased for the metric against which the quota limits are defined.
    * The value must not be negative.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
index 64cc3497ab..7798d6f43b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
@@ -33,7 +33,6 @@
  * [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] for
  * `"gce_instance"` has labels
  * `"project_id"`, `"instance_id"` and `"zone"`:
- *
  *     { "type": "gce_instance",
  *       "labels": { "project_id": "my-project",
  *                   "instance_id": "12345678901234",
@@ -62,6 +61,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MonitoredResource();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoredResourceProto
         .internal_static_google_api_MonitoredResource_descriptor;
@@ -449,7 +453,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] for
    * `"gce_instance"` has labels
    * `"project_id"`, `"instance_id"` and `"zone"`:
-   *
    *     { "type": "gce_instance",
    *       "labels": { "project_id": "my-project",
    *                   "instance_id": "12345678901234",
@@ -554,6 +557,39 @@ private void buildPartial0(com.google.api.MonitoredResource result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MonitoredResource) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java
index abe264e18a..3bb01b3c41 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java
@@ -28,7 +28,6 @@
  * Google Compute Engine VM instances has a type of
  * `"gce_instance"` and specifies the use of the labels `"instance_id"` and
  * `"zone"` to identify particular VM instances.
- *
  * Different APIs can support different monitored resource types. APIs generally
  * provide a `list` method that returns the monitored resource descriptors used
  * by the API.
@@ -61,6 +60,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MonitoredResourceDescriptor();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoredResourceProto
         .internal_static_google_api_MonitoredResourceDescriptor_descriptor;
@@ -639,7 +643,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Google Compute Engine VM instances has a type of
    * `"gce_instance"` and specifies the use of the labels `"instance_id"` and
    * `"zone"` to identify particular VM instances.
-   *
    * Different APIs can support different monitored resource types. APIs generally
    * provide a `list` method that returns the monitored resource descriptors used
    * by the API.
@@ -755,6 +758,39 @@ private void buildPartial0(com.google.api.MonitoredResourceDescriptor result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MonitoredResourceDescriptor) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
index b9277ee84b..a32f62611c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MonitoredResourceMetadata();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoredResourceProto
         .internal_static_google_api_MonitoredResourceMetadata_descriptor;
@@ -88,7 +93,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * "security_group", "name", etc.
    * System label values can be only strings, Boolean values, or a list of
    * strings. For example:
-   *
    *     { "name": "my-test-instance",
    *       "security_group": ["a", "b", "c"],
    *       "spot_instance": false }
@@ -112,7 +116,6 @@ public boolean hasSystemLabels() {
    * "security_group", "name", etc.
    * System label values can be only strings, Boolean values, or a list of
    * strings. For example:
-   *
    *     { "name": "my-test-instance",
    *       "security_group": ["a", "b", "c"],
    *       "spot_instance": false }
@@ -136,7 +139,6 @@ public com.google.protobuf.Struct getSystemLabels() {
    * "security_group", "name", etc.
    * System label values can be only strings, Boolean values, or a list of
    * strings. For example:
-   *
    *     { "name": "my-test-instance",
    *       "security_group": ["a", "b", "c"],
    *       "spot_instance": false }
@@ -547,6 +549,39 @@ private void buildPartial0(com.google.api.MonitoredResourceMetadata result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.MonitoredResourceMetadata) {
@@ -643,7 +678,6 @@ public Builder mergeFrom(
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -666,7 +700,6 @@ public boolean hasSystemLabels() {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -695,7 +728,6 @@ public com.google.protobuf.Struct getSystemLabels() {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -726,7 +758,6 @@ public Builder setSystemLabels(com.google.protobuf.Struct value) {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -754,7 +785,6 @@ public Builder setSystemLabels(com.google.protobuf.Struct.Builder builderForValu
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -788,7 +818,6 @@ public Builder mergeSystemLabels(com.google.protobuf.Struct value) {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -816,7 +845,6 @@ public Builder clearSystemLabels() {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -839,7 +867,6 @@ public com.google.protobuf.Struct.Builder getSystemLabelsBuilder() {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
@@ -866,7 +893,6 @@ public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
      * "security_group", "name", etc.
      * System label values can be only strings, Boolean values, or a list of
      * strings. For example:
-     *
      *     { "name": "my-test-instance",
      *       "security_group": ["a", "b", "c"],
      *       "spot_instance": false }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java
index 8ad34a06bf..452635ab52 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java
@@ -33,7 +33,6 @@ public interface MonitoredResourceMetadataOrBuilder
    * "security_group", "name", etc.
    * System label values can be only strings, Boolean values, or a list of
    * strings. For example:
-   *
    *     { "name": "my-test-instance",
    *       "security_group": ["a", "b", "c"],
    *       "spot_instance": false }
@@ -54,7 +53,6 @@ public interface MonitoredResourceMetadataOrBuilder
    * "security_group", "name", etc.
    * System label values can be only strings, Boolean values, or a list of
    * strings. For example:
-   *
    *     { "name": "my-test-instance",
    *       "security_group": ["a", "b", "c"],
    *       "spot_instance": false }
@@ -75,7 +73,6 @@ public interface MonitoredResourceMetadataOrBuilder
    * "security_group", "name", etc.
    * System label values can be only strings, Boolean values, or a list of
    * strings. For example:
-   *
    *     { "name": "my-test-instance",
    *       "security_group": ["a", "b", "c"],
    *       "spot_instance": false }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
index ce7f1db810..6f7d6a58ae 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
@@ -23,14 +23,12 @@
  *
  * <pre>
  * Monitoring configuration of the service.
- *
  * The example below shows how to configure monitored resources and metrics
  * for monitoring. In the example, a monitored resource and two metrics are
  * defined. The `library.googleapis.com/book/returned_count` metric is sent
  * to both producer and consumer projects, whereas the
  * `library.googleapis.com/book/num_overdue` metric is only sent to the
  * consumer project.
- *
  *     monitored_resources:
  *     - type: library.googleapis.com/Branch
  *       display_name: "Library Branch"
@@ -99,6 +97,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Monitoring();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_descriptor;
   }
@@ -226,7 +229,7 @@ private MonitoringDestination(com.google.protobuf.GeneratedMessageV3.Builder<?>
 
     private MonitoringDestination() {
       monitoredResource_ = "";
-      metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -235,6 +238,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new MonitoringDestination();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.MonitoringProto
           .internal_static_google_api_Monitoring_MonitoringDestination_descriptor;
@@ -308,8 +316,7 @@ public com.google.protobuf.ByteString getMonitoredResourceBytes() {
     public static final int METRICS_FIELD_NUMBER = 2;
 
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList metrics_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList metrics_;
     /**
      *
      *
@@ -595,7 +602,8 @@ public Builder clear() {
         super.clear();
         bitField0_ = 0;
         monitoredResource_ = "";
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -623,6 +631,7 @@ public com.google.api.Monitoring.MonitoringDestination build() {
       public com.google.api.Monitoring.MonitoringDestination buildPartial() {
         com.google.api.Monitoring.MonitoringDestination result =
             new com.google.api.Monitoring.MonitoringDestination(this);
+        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) {
           buildPartial0(result);
         }
@@ -630,15 +639,55 @@ public com.google.api.Monitoring.MonitoringDestination buildPartial() {
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.api.Monitoring.MonitoringDestination result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.metrics_ = metrics_;
+      }
+
       private void buildPartial0(com.google.api.Monitoring.MonitoringDestination result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.monitoredResource_ = monitoredResource_;
         }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          metrics_.makeImmutable();
-          result.metrics_ = metrics_;
-        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -662,7 +711,7 @@ public Builder mergeFrom(com.google.api.Monitoring.MonitoringDestination other)
         if (!other.metrics_.isEmpty()) {
           if (metrics_.isEmpty()) {
             metrics_ = other.metrics_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -843,14 +892,14 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList metrics_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      private com.google.protobuf.LazyStringList metrics_ =
+          com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureMetricsIsMutable() {
-        if (!metrics_.isModifiable()) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           metrics_ = new com.google.protobuf.LazyStringArrayList(metrics_);
+          bitField0_ |= 0x00000002;
         }
-        bitField0_ |= 0x00000002;
       }
       /**
        *
@@ -866,8 +915,7 @@ private void ensureMetricsIsMutable() {
        * @return A list containing the metrics.
        */
       public com.google.protobuf.ProtocolStringList getMetricsList() {
-        metrics_.makeImmutable();
-        return metrics_;
+        return metrics_.getUnmodifiableView();
       }
       /**
        *
@@ -940,7 +988,6 @@ public Builder setMetrics(int index, java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -964,7 +1011,6 @@ public Builder addMetrics(java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -985,7 +1031,6 @@ public Builder addMetrics(java.lang.String value) {
       public Builder addAllMetrics(java.lang.Iterable<java.lang.String> values) {
         ensureMetricsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, metrics_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1003,9 +1048,8 @@ public Builder addAllMetrics(java.lang.Iterable<java.lang.String> values) {
        * @return This builder for chaining.
        */
       public Builder clearMetrics() {
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        ;
         onChanged();
         return this;
       }
@@ -1030,7 +1074,6 @@ public Builder addMetricsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1472,14 +1515,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Monitoring configuration of the service.
-   *
    * The example below shows how to configure monitored resources and metrics
    * for monitoring. In the example, a monitored resource and two metrics are
    * defined. The `library.googleapis.com/book/returned_count` metric is sent
    * to both producer and consumer projects, whereas the
    * `library.googleapis.com/book/num_overdue` metric is only sent to the
    * consumer project.
-   *
    *     monitored_resources:
    *     - type: library.googleapis.com/Branch
    *       display_name: "Library Branch"
@@ -1626,6 +1667,39 @@ private void buildPartial0(com.google.api.Monitoring result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Monitoring) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettings.java
index 770d7847b8..2bef3c0bf9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettings.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new NodeSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_NodeSettings_descriptor;
   }
@@ -345,6 +350,39 @@ private void buildPartial0(com.google.api.NodeSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.NodeSettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
index 7f28f86b13..be32817aa1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
@@ -26,17 +26,13 @@
  * there are scopes defined for "Read-only access to Google Calendar" and
  * "Access to Cloud Platform". Users can consent to a scope for an application,
  * giving it permission to access that data on their behalf.
- *
  * OAuth scope specifications should be fairly coarse grained; a user will need
  * to see and understand the text description of what your scope means.
- *
  * In most cases: use one or at most two OAuth scopes for an entire family of
  * products. If your product has multiple APIs, you should probably be sharing
  * the OAuth scope across all of those APIs.
- *
  * When you need finer grained OAuth consent screens: talk with your product
  * management about how developers will use them in practice.
- *
  * Please note that even though each of the canonical scopes is enough for a
  * request to be accepted and passed to the backend, a request can still fail
  * due to the backend requiring additional scopes or permissions.
@@ -64,6 +60,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OAuthRequirements();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_descriptor;
   }
@@ -86,9 +87,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * The list of publicly documented OAuth scopes that are allowed access. An
    * OAuth token containing any of these scopes will be accepted.
-   *
    * Example:
-   *
    *      canonical_scopes: https://www.googleapis.com/auth/calendar,
    *                        https://www.googleapis.com/auth/calendar.read
    * </pre>
@@ -115,9 +114,7 @@ public java.lang.String getCanonicalScopes() {
    * <pre>
    * The list of publicly documented OAuth scopes that are allowed access. An
    * OAuth token containing any of these scopes will be accepted.
-   *
    * Example:
-   *
    *      canonical_scopes: https://www.googleapis.com/auth/calendar,
    *                        https://www.googleapis.com/auth/calendar.read
    * </pre>
@@ -304,17 +301,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * there are scopes defined for "Read-only access to Google Calendar" and
    * "Access to Cloud Platform". Users can consent to a scope for an application,
    * giving it permission to access that data on their behalf.
-   *
    * OAuth scope specifications should be fairly coarse grained; a user will need
    * to see and understand the text description of what your scope means.
-   *
    * In most cases: use one or at most two OAuth scopes for an entire family of
    * products. If your product has multiple APIs, you should probably be sharing
    * the OAuth scope across all of those APIs.
-   *
    * When you need finer grained OAuth consent screens: talk with your product
    * management about how developers will use them in practice.
-   *
    * Please note that even though each of the canonical scopes is enough for a
    * request to be accepted and passed to the backend, a request can still fail
    * due to the backend requiring additional scopes or permissions.
@@ -391,6 +384,39 @@ private void buildPartial0(com.google.api.OAuthRequirements result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.OAuthRequirements) {
@@ -466,9 +492,7 @@ public Builder mergeFrom(
      * <pre>
      * The list of publicly documented OAuth scopes that are allowed access. An
      * OAuth token containing any of these scopes will be accepted.
-     *
      * Example:
-     *
      *      canonical_scopes: https://www.googleapis.com/auth/calendar,
      *                        https://www.googleapis.com/auth/calendar.read
      * </pre>
@@ -494,9 +518,7 @@ public java.lang.String getCanonicalScopes() {
      * <pre>
      * The list of publicly documented OAuth scopes that are allowed access. An
      * OAuth token containing any of these scopes will be accepted.
-     *
      * Example:
-     *
      *      canonical_scopes: https://www.googleapis.com/auth/calendar,
      *                        https://www.googleapis.com/auth/calendar.read
      * </pre>
@@ -522,9 +544,7 @@ public com.google.protobuf.ByteString getCanonicalScopesBytes() {
      * <pre>
      * The list of publicly documented OAuth scopes that are allowed access. An
      * OAuth token containing any of these scopes will be accepted.
-     *
      * Example:
-     *
      *      canonical_scopes: https://www.googleapis.com/auth/calendar,
      *                        https://www.googleapis.com/auth/calendar.read
      * </pre>
@@ -549,9 +569,7 @@ public Builder setCanonicalScopes(java.lang.String value) {
      * <pre>
      * The list of publicly documented OAuth scopes that are allowed access. An
      * OAuth token containing any of these scopes will be accepted.
-     *
      * Example:
-     *
      *      canonical_scopes: https://www.googleapis.com/auth/calendar,
      *                        https://www.googleapis.com/auth/calendar.read
      * </pre>
@@ -572,9 +590,7 @@ public Builder clearCanonicalScopes() {
      * <pre>
      * The list of publicly documented OAuth scopes that are allowed access. An
      * OAuth token containing any of these scopes will be accepted.
-     *
      * Example:
-     *
      *      canonical_scopes: https://www.googleapis.com/auth/calendar,
      *                        https://www.googleapis.com/auth/calendar.read
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirementsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirementsOrBuilder.java
index 7415ca3162..27a92e367e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirementsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirementsOrBuilder.java
@@ -29,9 +29,7 @@ public interface OAuthRequirementsOrBuilder
    * <pre>
    * The list of publicly documented OAuth scopes that are allowed access. An
    * OAuth token containing any of these scopes will be accepted.
-   *
    * Example:
-   *
    *      canonical_scopes: https://www.googleapis.com/auth/calendar,
    *                        https://www.googleapis.com/auth/calendar.read
    * </pre>
@@ -47,9 +45,7 @@ public interface OAuthRequirementsOrBuilder
    * <pre>
    * The list of publicly documented OAuth scopes that are allowed access. An
    * OAuth token containing any of these scopes will be accepted.
-   *
    * Example:
-   *
    *      canonical_scopes: https://www.googleapis.com/auth/calendar,
    *                        https://www.googleapis.com/auth/calendar.read
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java
index 7d6d287a0c..4b65ff2c48 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Page();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DocumentationProto.internal_static_google_api_Page_descriptor;
   }
@@ -547,6 +552,39 @@ private void buildPartial0(com.google.api.Page result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Page) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettings.java
index db2200da6e..1dea477ba1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettings.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PhpSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_PhpSettings_descriptor;
   }
@@ -345,6 +350,39 @@ private void buildPartial0(com.google.api.PhpSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.PhpSettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
index 00445968be..977f71fc47 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
@@ -28,9 +28,7 @@
  * associated with a school, or a business, or a government agency, a business
  * type property on the project may affect how a service responds to the client.
  * This descriptor defines which properties are allowed to be set on a project.
- *
  * Example:
- *
  *    project_properties:
  *      properties:
  *      - name: NO_WATERMARK
@@ -62,6 +60,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ProjectProperties();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_descriptor;
   }
@@ -314,9 +317,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * associated with a school, or a business, or a government agency, a business
    * type property on the project may affect how a service responds to the client.
    * This descriptor defines which properties are allowed to be set on a project.
-   *
    * Example:
-   *
    *    project_properties:
    *      properties:
    *      - name: NO_WATERMARK
@@ -413,6 +414,39 @@ private void buildPartial0(com.google.api.ProjectProperties result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ProjectProperties) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Property.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Property.java
index e383889920..9a84766c27 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Property.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Property.java
@@ -23,13 +23,11 @@
  *
  * <pre>
  * Defines project properties.
- *
  * API services can define properties that can be assigned to consumer projects
  * so that backends can perform response customization without having to make
  * additional calls or maintain additional storage. For example, Maps API
  * defines properties that controls map tile cache period, or whether to embed a
  * watermark in a result.
- *
  * These values can be set via API producer console. Only API providers can
  * define and set these properties.
  * </pre>
@@ -58,6 +56,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Property();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConsumerProto.internal_static_google_api_Property_descriptor;
   }
@@ -588,13 +591,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Defines project properties.
-   *
    * API services can define properties that can be assigned to consumer projects
    * so that backends can perform response customization without having to make
    * additional calls or maintain additional storage. For example, Maps API
    * defines properties that controls map tile cache period, or whether to embed a
    * watermark in a result.
-   *
    * These values can be set via API producer console. Only API providers can
    * define and set these properties.
    * </pre>
@@ -676,6 +677,39 @@ private void buildPartial0(com.google.api.Property result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Property) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
index 31233038c3..93bc20d91e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
@@ -45,7 +45,7 @@ private Publishing() {
     documentationUri_ = "";
     apiShortName_ = "";
     githubLabel_ = "";
-    codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     docTagPrefix_ = "";
     organization_ = 0;
     librarySettings_ = java.util.Collections.emptyList();
@@ -58,6 +58,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Publishing();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_Publishing_descriptor;
   }
@@ -361,8 +366,7 @@ public com.google.protobuf.ByteString getGithubLabelBytes() {
   public static final int CODEOWNER_GITHUB_TEAMS_FIELD_NUMBER = 105;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList codeownerGithubTeams_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList codeownerGithubTeams_;
   /**
    *
    *
@@ -956,7 +960,8 @@ public Builder clear() {
       documentationUri_ = "";
       apiShortName_ = "";
       githubLabel_ = "";
-      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000020);
       docTagPrefix_ = "";
       organization_ = 0;
       if (librarySettingsBuilder_ == null) {
@@ -1010,6 +1015,11 @@ private void buildPartialRepeatedFields(com.google.api.Publishing result) {
       } else {
         result.methodSettings_ = methodSettingsBuilder_.build();
       }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        codeownerGithubTeams_ = codeownerGithubTeams_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000020);
+      }
+      result.codeownerGithubTeams_ = codeownerGithubTeams_;
       if (librarySettingsBuilder_ == null) {
         if (((bitField0_ & 0x00000100) != 0)) {
           librarySettings_ = java.util.Collections.unmodifiableList(librarySettings_);
@@ -1035,10 +1045,6 @@ private void buildPartial0(com.google.api.Publishing result) {
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.githubLabel_ = githubLabel_;
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        codeownerGithubTeams_.makeImmutable();
-        result.codeownerGithubTeams_ = codeownerGithubTeams_;
-      }
       if (((from_bitField0_ & 0x00000040) != 0)) {
         result.docTagPrefix_ = docTagPrefix_;
       }
@@ -1050,6 +1056,39 @@ private void buildPartial0(com.google.api.Publishing result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Publishing) {
@@ -1112,7 +1151,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
       if (!other.codeownerGithubTeams_.isEmpty()) {
         if (codeownerGithubTeams_.isEmpty()) {
           codeownerGithubTeams_ = other.codeownerGithubTeams_;
-          bitField0_ |= 0x00000020;
+          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
           ensureCodeownerGithubTeamsIsMutable();
           codeownerGithubTeams_.addAll(other.codeownerGithubTeams_);
@@ -2091,14 +2130,14 @@ public Builder setGithubLabelBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList codeownerGithubTeams_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList codeownerGithubTeams_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureCodeownerGithubTeamsIsMutable() {
-      if (!codeownerGithubTeams_.isModifiable()) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         codeownerGithubTeams_ = new com.google.protobuf.LazyStringArrayList(codeownerGithubTeams_);
+        bitField0_ |= 0x00000020;
       }
-      bitField0_ |= 0x00000020;
     }
     /**
      *
@@ -2113,8 +2152,7 @@ private void ensureCodeownerGithubTeamsIsMutable() {
      * @return A list containing the codeownerGithubTeams.
      */
     public com.google.protobuf.ProtocolStringList getCodeownerGithubTeamsList() {
-      codeownerGithubTeams_.makeImmutable();
-      return codeownerGithubTeams_;
+      return codeownerGithubTeams_.getUnmodifiableView();
     }
     /**
      *
@@ -2183,7 +2221,6 @@ public Builder setCodeownerGithubTeams(int index, java.lang.String value) {
       }
       ensureCodeownerGithubTeamsIsMutable();
       codeownerGithubTeams_.set(index, value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2206,7 +2243,6 @@ public Builder addCodeownerGithubTeams(java.lang.String value) {
       }
       ensureCodeownerGithubTeamsIsMutable();
       codeownerGithubTeams_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2226,7 +2262,6 @@ public Builder addCodeownerGithubTeams(java.lang.String value) {
     public Builder addAllCodeownerGithubTeams(java.lang.Iterable<java.lang.String> values) {
       ensureCodeownerGithubTeamsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, codeownerGithubTeams_);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2243,9 +2278,8 @@ public Builder addAllCodeownerGithubTeams(java.lang.Iterable<java.lang.String> v
      * @return This builder for chaining.
      */
     public Builder clearCodeownerGithubTeams() {
-      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000020);
-      ;
       onChanged();
       return this;
     }
@@ -2269,7 +2303,6 @@ public Builder addCodeownerGithubTeamsBytes(com.google.protobuf.ByteString value
       checkByteStringIsUtf8(value);
       ensureCodeownerGithubTeamsIsMutable();
       codeownerGithubTeams_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
index ca31ed3cbe..fc9d3c3bda 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PythonSettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_PythonSettings_descriptor;
   }
@@ -345,6 +350,39 @@ private void buildPartial0(com.google.api.PythonSettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.PythonSettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java
index e49a0ea1e0..7371ab54f7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java
@@ -24,26 +24,20 @@
  * <pre>
  * Quota configuration helps to achieve fairness and budgeting in service
  * usage.
- *
  * The metric based quota configuration works this way:
  * - The service configuration defines a set of metrics.
  * - For API calls, the quota.metric_rules maps methods to metrics with
  *   corresponding costs.
  * - The quota.limits defines limits on the metrics, which will be used for
  *   quota checks at runtime.
- *
  * An example quota configuration in yaml format:
- *
  *    quota:
  *      limits:
- *
  *      - name: apiWriteQpsPerProject
  *        metric: library.googleapis.com/write_calls
  *        unit: "1/min/{project}"  # rate limit for consumer projects
  *        values:
  *          STANDARD: 10000
- *
- *
  *      (The metric rules bind all methods to the read_calls metric,
  *       except for the UpdateBook and DeleteBook methods. These two methods
  *       are mapped to the write_calls metric, with the UpdateBook method
@@ -58,15 +52,12 @@
  *      - selector: google.example.library.v1.LibraryService.DeleteBook
  *        metric_costs:
  *          library.googleapis.com/write_calls: 1
- *
  *  Corresponding Metric definition:
- *
  *      metrics:
  *      - name: library.googleapis.com/read_calls
  *        display_name: Read requests
  *        metric_kind: DELTA
  *        value_type: INT64
- *
  *      - name: library.googleapis.com/write_calls
  *        display_name: Write requests
  *        metric_kind: DELTA
@@ -96,6 +87,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Quota();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.QuotaProto.internal_static_google_api_Quota_descriptor;
   }
@@ -430,26 +426,20 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre>
    * Quota configuration helps to achieve fairness and budgeting in service
    * usage.
-   *
    * The metric based quota configuration works this way:
    * - The service configuration defines a set of metrics.
    * - For API calls, the quota.metric_rules maps methods to metrics with
    *   corresponding costs.
    * - The quota.limits defines limits on the metrics, which will be used for
    *   quota checks at runtime.
-   *
    * An example quota configuration in yaml format:
-   *
    *    quota:
    *      limits:
-   *
    *      - name: apiWriteQpsPerProject
    *        metric: library.googleapis.com/write_calls
    *        unit: "1/min/{project}"  # rate limit for consumer projects
    *        values:
    *          STANDARD: 10000
-   *
-   *
    *      (The metric rules bind all methods to the read_calls metric,
    *       except for the UpdateBook and DeleteBook methods. These two methods
    *       are mapped to the write_calls metric, with the UpdateBook method
@@ -464,15 +454,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *      - selector: google.example.library.v1.LibraryService.DeleteBook
    *        metric_costs:
    *          library.googleapis.com/write_calls: 1
-   *
    *  Corresponding Metric definition:
-   *
    *      metrics:
    *      - name: library.googleapis.com/read_calls
    *        display_name: Read requests
    *        metric_kind: DELTA
    *        value_type: INT64
-   *
    *      - name: library.googleapis.com/write_calls
    *        display_name: Write requests
    *        metric_kind: DELTA
@@ -580,6 +567,39 @@ private void buildPartial0(com.google.api.Quota result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Quota) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
index 9c19169c63..add2026b1f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
@@ -54,6 +54,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new QuotaLimit();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.QuotaProto.internal_static_google_api_QuotaLimit_descriptor;
   }
@@ -86,10 +91,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * <pre>
    * Name of the quota limit.
-   *
    * The name must be provided, and it must be unique within the service. The
    * name can only include alphanumeric characters as well as '-'.
-   *
    * The maximum length of the limit name is 64 characters.
    * </pre>
    *
@@ -114,10 +117,8 @@ public java.lang.String getName() {
    *
    * <pre>
    * Name of the quota limit.
-   *
    * The name must be provided, and it must be unique within the service. The
    * name can only include alphanumeric characters as well as '-'.
-   *
    * The maximum length of the limit name is 64 characters.
    * </pre>
    *
@@ -202,12 +203,10 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    * Default number of tokens that can be consumed during the specified
    * duration. This is the number of tokens assigned when a client
    * application developer activates the service for his/her project.
-   *
    * Specifying a value of 0 will block all requests. This can be used if you
    * are provisioning quota to selected consumers and blocking others.
    * Similarly, a value of -1 will indicate an unlimited quota. No other
    * negative values are allowed.
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -230,10 +229,8 @@ public long getDefaultLimit() {
    * duration. Client application developers can override the default limit up
    * to this maximum. If specified, this value cannot be set to a value less
    * than the default limit. If not specified, it is set to the default limit.
-   *
    * To allow clients to apply overrides with no upper bound, set this to -1,
    * indicating unlimited maximum quota.
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -258,7 +255,6 @@ public long getMaxLimit() {
    * This field can only be set on a limit with duration "1d", in a billable
    * group; it is invalid on any other limit. If this field is not set, it
    * defaults to 0, indicating that there is no free tier for this service.
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -280,7 +276,6 @@ public long getFreeTier() {
    *
    * <pre>
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -305,7 +300,6 @@ public java.lang.String getDuration() {
    *
    * <pre>
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -392,10 +386,8 @@ public com.google.protobuf.ByteString getMetricBytes() {
    * Specify the unit of the quota limit. It uses the same syntax as
    * [Metric.unit][]. The supported unit kinds are determined by the quota
    * backend system.
-   *
    * Here are some examples:
    * * "1/min/{project}" for quota per minute per project.
-   *
    * Note: the order of unit components is insignificant.
    * The "1" at the beginning is required to follow the metric unit syntax.
    * </pre>
@@ -423,10 +415,8 @@ public java.lang.String getUnit() {
    * Specify the unit of the quota limit. It uses the same syntax as
    * [Metric.unit][]. The supported unit kinds are determined by the quota
    * backend system.
-   *
    * Here are some examples:
    * * "1/min/{project}" for quota per minute per project.
-   *
    * Note: the order of unit components is insignificant.
    * The "1" at the beginning is required to follow the metric unit syntax.
    * </pre>
@@ -992,6 +982,39 @@ private void buildPartial0(com.google.api.QuotaLimit result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.QuotaLimit) {
@@ -1162,10 +1185,8 @@ public Builder mergeFrom(
      *
      * <pre>
      * Name of the quota limit.
-     *
      * The name must be provided, and it must be unique within the service. The
      * name can only include alphanumeric characters as well as '-'.
-     *
      * The maximum length of the limit name is 64 characters.
      * </pre>
      *
@@ -1189,10 +1210,8 @@ public java.lang.String getName() {
      *
      * <pre>
      * Name of the quota limit.
-     *
      * The name must be provided, and it must be unique within the service. The
      * name can only include alphanumeric characters as well as '-'.
-     *
      * The maximum length of the limit name is 64 characters.
      * </pre>
      *
@@ -1216,10 +1235,8 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * <pre>
      * Name of the quota limit.
-     *
      * The name must be provided, and it must be unique within the service. The
      * name can only include alphanumeric characters as well as '-'.
-     *
      * The maximum length of the limit name is 64 characters.
      * </pre>
      *
@@ -1242,10 +1259,8 @@ public Builder setName(java.lang.String value) {
      *
      * <pre>
      * Name of the quota limit.
-     *
      * The name must be provided, and it must be unique within the service. The
      * name can only include alphanumeric characters as well as '-'.
-     *
      * The maximum length of the limit name is 64 characters.
      * </pre>
      *
@@ -1264,10 +1279,8 @@ public Builder clearName() {
      *
      * <pre>
      * Name of the quota limit.
-     *
      * The name must be provided, and it must be unique within the service. The
      * name can only include alphanumeric characters as well as '-'.
-     *
      * The maximum length of the limit name is 64 characters.
      * </pre>
      *
@@ -1411,12 +1424,10 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
      * Default number of tokens that can be consumed during the specified
      * duration. This is the number of tokens assigned when a client
      * application developer activates the service for his/her project.
-     *
      * Specifying a value of 0 will block all requests. This can be used if you
      * are provisioning quota to selected consumers and blocking others.
      * Similarly, a value of -1 will indicate an unlimited quota. No other
      * negative values are allowed.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1435,12 +1446,10 @@ public long getDefaultLimit() {
      * Default number of tokens that can be consumed during the specified
      * duration. This is the number of tokens assigned when a client
      * application developer activates the service for his/her project.
-     *
      * Specifying a value of 0 will block all requests. This can be used if you
      * are provisioning quota to selected consumers and blocking others.
      * Similarly, a value of -1 will indicate an unlimited quota. No other
      * negative values are allowed.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1463,12 +1472,10 @@ public Builder setDefaultLimit(long value) {
      * Default number of tokens that can be consumed during the specified
      * duration. This is the number of tokens assigned when a client
      * application developer activates the service for his/her project.
-     *
      * Specifying a value of 0 will block all requests. This can be used if you
      * are provisioning quota to selected consumers and blocking others.
      * Similarly, a value of -1 will indicate an unlimited quota. No other
      * negative values are allowed.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1492,10 +1499,8 @@ public Builder clearDefaultLimit() {
      * duration. Client application developers can override the default limit up
      * to this maximum. If specified, this value cannot be set to a value less
      * than the default limit. If not specified, it is set to the default limit.
-     *
      * To allow clients to apply overrides with no upper bound, set this to -1,
      * indicating unlimited maximum quota.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1515,10 +1520,8 @@ public long getMaxLimit() {
      * duration. Client application developers can override the default limit up
      * to this maximum. If specified, this value cannot be set to a value less
      * than the default limit. If not specified, it is set to the default limit.
-     *
      * To allow clients to apply overrides with no upper bound, set this to -1,
      * indicating unlimited maximum quota.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1542,10 +1545,8 @@ public Builder setMaxLimit(long value) {
      * duration. Client application developers can override the default limit up
      * to this maximum. If specified, this value cannot be set to a value less
      * than the default limit. If not specified, it is set to the default limit.
-     *
      * To allow clients to apply overrides with no upper bound, set this to -1,
      * indicating unlimited maximum quota.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1571,7 +1572,6 @@ public Builder clearMaxLimit() {
      * This field can only be set on a limit with duration "1d", in a billable
      * group; it is invalid on any other limit. If this field is not set, it
      * defaults to 0, indicating that there is no free tier for this service.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1593,7 +1593,6 @@ public long getFreeTier() {
      * This field can only be set on a limit with duration "1d", in a billable
      * group; it is invalid on any other limit. If this field is not set, it
      * defaults to 0, indicating that there is no free tier for this service.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1619,7 +1618,6 @@ public Builder setFreeTier(long value) {
      * This field can only be set on a limit with duration "1d", in a billable
      * group; it is invalid on any other limit. If this field is not set, it
      * defaults to 0, indicating that there is no free tier for this service.
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1640,7 +1638,6 @@ public Builder clearFreeTier() {
      *
      * <pre>
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1664,7 +1661,6 @@ public java.lang.String getDuration() {
      *
      * <pre>
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1688,7 +1684,6 @@ public com.google.protobuf.ByteString getDurationBytes() {
      *
      * <pre>
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1711,7 +1706,6 @@ public Builder setDuration(java.lang.String value) {
      *
      * <pre>
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1730,7 +1724,6 @@ public Builder clearDuration() {
      *
      * <pre>
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * </pre>
      *
@@ -1874,10 +1867,8 @@ public Builder setMetricBytes(com.google.protobuf.ByteString value) {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [Metric.unit][]. The supported unit kinds are determined by the quota
      * backend system.
-     *
      * Here are some examples:
      * * "1/min/{project}" for quota per minute per project.
-     *
      * Note: the order of unit components is insignificant.
      * The "1" at the beginning is required to follow the metric unit syntax.
      * </pre>
@@ -1904,10 +1895,8 @@ public java.lang.String getUnit() {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [Metric.unit][]. The supported unit kinds are determined by the quota
      * backend system.
-     *
      * Here are some examples:
      * * "1/min/{project}" for quota per minute per project.
-     *
      * Note: the order of unit components is insignificant.
      * The "1" at the beginning is required to follow the metric unit syntax.
      * </pre>
@@ -1934,10 +1923,8 @@ public com.google.protobuf.ByteString getUnitBytes() {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [Metric.unit][]. The supported unit kinds are determined by the quota
      * backend system.
-     *
      * Here are some examples:
      * * "1/min/{project}" for quota per minute per project.
-     *
      * Note: the order of unit components is insignificant.
      * The "1" at the beginning is required to follow the metric unit syntax.
      * </pre>
@@ -1963,10 +1950,8 @@ public Builder setUnit(java.lang.String value) {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [Metric.unit][]. The supported unit kinds are determined by the quota
      * backend system.
-     *
      * Here are some examples:
      * * "1/min/{project}" for quota per minute per project.
-     *
      * Note: the order of unit components is insignificant.
      * The "1" at the beginning is required to follow the metric unit syntax.
      * </pre>
@@ -1988,10 +1973,8 @@ public Builder clearUnit() {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [Metric.unit][]. The supported unit kinds are determined by the quota
      * backend system.
-     *
      * Here are some examples:
      * * "1/min/{project}" for quota per minute per project.
-     *
      * Note: the order of unit components is insignificant.
      * The "1" at the beginning is required to follow the metric unit syntax.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java
index 5a11650910..5f0a4d43db 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java
@@ -28,10 +28,8 @@ public interface QuotaLimitOrBuilder
    *
    * <pre>
    * Name of the quota limit.
-   *
    * The name must be provided, and it must be unique within the service. The
    * name can only include alphanumeric characters as well as '-'.
-   *
    * The maximum length of the limit name is 64 characters.
    * </pre>
    *
@@ -45,10 +43,8 @@ public interface QuotaLimitOrBuilder
    *
    * <pre>
    * Name of the quota limit.
-   *
    * The name must be provided, and it must be unique within the service. The
    * name can only include alphanumeric characters as well as '-'.
-   *
    * The maximum length of the limit name is 64 characters.
    * </pre>
    *
@@ -94,12 +90,10 @@ public interface QuotaLimitOrBuilder
    * Default number of tokens that can be consumed during the specified
    * duration. This is the number of tokens assigned when a client
    * application developer activates the service for his/her project.
-   *
    * Specifying a value of 0 will block all requests. This can be used if you
    * are provisioning quota to selected consumers and blocking others.
    * Similarly, a value of -1 will indicate an unlimited quota. No other
    * negative values are allowed.
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -117,10 +111,8 @@ public interface QuotaLimitOrBuilder
    * duration. Client application developers can override the default limit up
    * to this maximum. If specified, this value cannot be set to a value less
    * than the default limit. If not specified, it is set to the default limit.
-   *
    * To allow clients to apply overrides with no upper bound, set this to -1,
    * indicating unlimited maximum quota.
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -140,7 +132,6 @@ public interface QuotaLimitOrBuilder
    * This field can only be set on a limit with duration "1d", in a billable
    * group; it is invalid on any other limit. If this field is not set, it
    * defaults to 0, indicating that there is no free tier for this service.
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -155,7 +146,6 @@ public interface QuotaLimitOrBuilder
    *
    * <pre>
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -169,7 +159,6 @@ public interface QuotaLimitOrBuilder
    *
    * <pre>
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * </pre>
    *
@@ -215,10 +204,8 @@ public interface QuotaLimitOrBuilder
    * Specify the unit of the quota limit. It uses the same syntax as
    * [Metric.unit][]. The supported unit kinds are determined by the quota
    * backend system.
-   *
    * Here are some examples:
    * * "1/min/{project}" for quota per minute per project.
-   *
    * Note: the order of unit components is insignificant.
    * The "1" at the beginning is required to follow the metric unit syntax.
    * </pre>
@@ -235,10 +222,8 @@ public interface QuotaLimitOrBuilder
    * Specify the unit of the quota limit. It uses the same syntax as
    * [Metric.unit][]. The supported unit kinds are determined by the quota
    * backend system.
-   *
    * Here are some examples:
    * * "1/min/{project}" for quota per minute per project.
-   *
    * Note: the order of unit components is insignificant.
    * The "1" at the beginning is required to follow the metric unit syntax.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java
index db10b7765e..253ab1fda8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java
@@ -23,13 +23,10 @@
  *
  * <pre>
  * A simple descriptor of a resource type.
- *
  * ResourceDescriptor annotates a resource message (either by means of a
  * protobuf annotation or use in the service config), and associates the
  * resource's schema, the resource type, and the pattern of the resource name.
- *
  * Example:
- *
  *     message Topic {
  *       // Indicates this message defines a resource schema.
  *       // Declares the resource type in the format of {service}/{kind}.
@@ -39,18 +36,13 @@
  *         pattern: "projects/{project}/topics/{topic}"
  *       };
  *     }
- *
  * The ResourceDescriptor Yaml config will look like:
- *
  *     resources:
  *     - type: "pubsub.googleapis.com/Topic"
  *       pattern: "projects/{project}/topics/{topic}"
- *
  * Sometimes, resources have multiple patterns, typically because they can
  * live under multiple parents.
- *
  * Example:
- *
  *     message LogEntry {
  *       option (google.api.resource) = {
  *         type: "logging.googleapis.com/LogEntry"
@@ -60,9 +52,7 @@
  *         pattern: "billingAccounts/{billing_account}/logs/{log}"
  *       };
  *     }
- *
  * The ResourceDescriptor Yaml config will look like:
- *
  *     resources:
  *     - type: 'logging.googleapis.com/LogEntry'
  *       pattern: "projects/{project}/logs/{log}"
@@ -85,7 +75,7 @@ private ResourceDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> bui
 
   private ResourceDescriptor() {
     type_ = "";
-    pattern_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     nameField_ = "";
     history_ = 0;
     plural_ = "";
@@ -99,6 +89,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResourceDescriptor();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ResourceProto.internal_static_google_api_ResourceDescriptor_descriptor;
   }
@@ -302,11 +297,9 @@ public enum Style implements com.google.protobuf.ProtocolMessageEnum {
      *
      * <pre>
      * This resource is intended to be "declarative-friendly".
-     *
      * Declarative-friendly resources must be more strictly consistent, and
      * setting this to true communicates to tools that this resource should
      * adhere to declarative-friendly expectations.
-     *
      * Note: This is used by the API linter (linter.aip.dev) to enable
      * additional checks.
      * </pre>
@@ -332,11 +325,9 @@ public enum Style implements com.google.protobuf.ProtocolMessageEnum {
      *
      * <pre>
      * This resource is intended to be "declarative-friendly".
-     *
      * Declarative-friendly resources must be more strictly consistent, and
      * setting this to true communicates to tools that this resource should
      * adhere to declarative-friendly expectations.
-     *
      * Note: This is used by the API linter (linter.aip.dev) to enable
      * additional checks.
      * </pre>
@@ -437,9 +428,7 @@ private Style(int value) {
    * The resource type. It must be in the format of
    * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
    * singular and must not include version numbers.
-   *
    * Example: `storage.googleapis.com/Bucket`
-   *
    * The value of the resource_type_kind must follow the regular expression
    * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
    * should use PascalCase (UpperCamelCase). The maximum number of
@@ -469,9 +458,7 @@ public java.lang.String getType() {
    * The resource type. It must be in the format of
    * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
    * singular and must not include version numbers.
-   *
    * Example: `storage.googleapis.com/Bucket`
-   *
    * The value of the resource_type_kind must follow the regular expression
    * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
    * should use PascalCase (UpperCamelCase). The maximum number of
@@ -498,27 +485,21 @@ public com.google.protobuf.ByteString getTypeBytes() {
   public static final int PATTERN_FIELD_NUMBER = 2;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList pattern_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList pattern_;
   /**
    *
    *
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -538,19 +519,14 @@ public com.google.protobuf.ProtocolStringList getPatternList() {
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -570,19 +546,14 @@ public int getPatternCount() {
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -603,19 +574,14 @@ public java.lang.String getPattern(int index) {
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -691,9 +657,7 @@ public com.google.protobuf.ByteString getNameFieldBytes() {
    *
    * <pre>
    * Optional. The historical or future-looking state of the resource pattern.
-   *
    * Example:
-   *
    *     // The InspectTemplate message originally only supported resource
    *     // names with organization, and project was added later.
    *     message InspectTemplate {
@@ -720,9 +684,7 @@ public int getHistoryValue() {
    *
    * <pre>
    * Optional. The historical or future-looking state of the resource pattern.
-   *
    * Example:
-   *
    *     // The InspectTemplate message originally only supported resource
    *     // names with organization, and project was added later.
    *     message InspectTemplate {
@@ -760,7 +722,6 @@ public com.google.api.ResourceDescriptor.History getHistory() {
    * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
    * concept of the `plural` field in k8s CRD spec
    * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-   *
    * Note: The plural form is required even for singleton resources. See
    * https://aip.dev/156
    * </pre>
@@ -790,7 +751,6 @@ public java.lang.String getPlural() {
    * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
    * concept of the `plural` field in k8s CRD spec
    * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-   *
    * Note: The plural form is required even for singleton resources. See
    * https://aip.dev/156
    * </pre>
@@ -1213,13 +1173,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * A simple descriptor of a resource type.
-   *
    * ResourceDescriptor annotates a resource message (either by means of a
    * protobuf annotation or use in the service config), and associates the
    * resource's schema, the resource type, and the pattern of the resource name.
-   *
    * Example:
-   *
    *     message Topic {
    *       // Indicates this message defines a resource schema.
    *       // Declares the resource type in the format of {service}/{kind}.
@@ -1229,18 +1186,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         pattern: "projects/{project}/topics/{topic}"
    *       };
    *     }
-   *
    * The ResourceDescriptor Yaml config will look like:
-   *
    *     resources:
    *     - type: "pubsub.googleapis.com/Topic"
    *       pattern: "projects/{project}/topics/{topic}"
-   *
    * Sometimes, resources have multiple patterns, typically because they can
    * live under multiple parents.
-   *
    * Example:
-   *
    *     message LogEntry {
    *       option (google.api.resource) = {
    *         type: "logging.googleapis.com/LogEntry"
@@ -1250,9 +1202,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         pattern: "billingAccounts/{billing_account}/logs/{log}"
    *       };
    *     }
-   *
    * The ResourceDescriptor Yaml config will look like:
-   *
    *     resources:
    *     - type: 'logging.googleapis.com/LogEntry'
    *       pattern: "projects/{project}/logs/{log}"
@@ -1293,7 +1243,8 @@ public Builder clear() {
       super.clear();
       bitField0_ = 0;
       type_ = "";
-      pattern_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       nameField_ = "";
       history_ = 0;
       plural_ = "";
@@ -1334,6 +1285,11 @@ public com.google.api.ResourceDescriptor buildPartial() {
     }
 
     private void buildPartialRepeatedFields(com.google.api.ResourceDescriptor result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        pattern_ = pattern_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.pattern_ = pattern_;
       if (((bitField0_ & 0x00000040) != 0)) {
         style_ = java.util.Collections.unmodifiableList(style_);
         bitField0_ = (bitField0_ & ~0x00000040);
@@ -1346,10 +1302,6 @@ private void buildPartial0(com.google.api.ResourceDescriptor result) {
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.type_ = type_;
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        pattern_.makeImmutable();
-        result.pattern_ = pattern_;
-      }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.nameField_ = nameField_;
       }
@@ -1364,6 +1316,39 @@ private void buildPartial0(com.google.api.ResourceDescriptor result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ResourceDescriptor) {
@@ -1384,7 +1369,7 @@ public Builder mergeFrom(com.google.api.ResourceDescriptor other) {
       if (!other.pattern_.isEmpty()) {
         if (pattern_.isEmpty()) {
           pattern_ = other.pattern_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensurePatternIsMutable();
           pattern_.addAll(other.pattern_);
@@ -1528,9 +1513,7 @@ public Builder mergeFrom(
      * The resource type. It must be in the format of
      * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
      * singular and must not include version numbers.
-     *
      * Example: `storage.googleapis.com/Bucket`
-     *
      * The value of the resource_type_kind must follow the regular expression
      * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
      * should use PascalCase (UpperCamelCase). The maximum number of
@@ -1559,9 +1542,7 @@ public java.lang.String getType() {
      * The resource type. It must be in the format of
      * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
      * singular and must not include version numbers.
-     *
      * Example: `storage.googleapis.com/Bucket`
-     *
      * The value of the resource_type_kind must follow the regular expression
      * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
      * should use PascalCase (UpperCamelCase). The maximum number of
@@ -1590,9 +1571,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
      * The resource type. It must be in the format of
      * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
      * singular and must not include version numbers.
-     *
      * Example: `storage.googleapis.com/Bucket`
-     *
      * The value of the resource_type_kind must follow the regular expression
      * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
      * should use PascalCase (UpperCamelCase). The maximum number of
@@ -1620,9 +1599,7 @@ public Builder setType(java.lang.String value) {
      * The resource type. It must be in the format of
      * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
      * singular and must not include version numbers.
-     *
      * Example: `storage.googleapis.com/Bucket`
-     *
      * The value of the resource_type_kind must follow the regular expression
      * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
      * should use PascalCase (UpperCamelCase). The maximum number of
@@ -1646,9 +1623,7 @@ public Builder clearType() {
      * The resource type. It must be in the format of
      * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
      * singular and must not include version numbers.
-     *
      * Example: `storage.googleapis.com/Bucket`
-     *
      * The value of the resource_type_kind must follow the regular expression
      * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
      * should use PascalCase (UpperCamelCase). The maximum number of
@@ -1671,14 +1646,14 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList pattern_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList pattern_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensurePatternIsMutable() {
-      if (!pattern_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         pattern_ = new com.google.protobuf.LazyStringArrayList(pattern_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000002;
     }
     /**
      *
@@ -1686,19 +1661,14 @@ private void ensurePatternIsMutable() {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1710,8 +1680,7 @@ private void ensurePatternIsMutable() {
      * @return A list containing the pattern.
      */
     public com.google.protobuf.ProtocolStringList getPatternList() {
-      pattern_.makeImmutable();
-      return pattern_;
+      return pattern_.getUnmodifiableView();
     }
     /**
      *
@@ -1719,19 +1688,14 @@ public com.google.protobuf.ProtocolStringList getPatternList() {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1751,19 +1715,14 @@ public int getPatternCount() {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1784,19 +1743,14 @@ public java.lang.String getPattern(int index) {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1817,19 +1771,14 @@ public com.google.protobuf.ByteString getPatternBytes(int index) {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1848,7 +1797,6 @@ public Builder setPattern(int index, java.lang.String value) {
       }
       ensurePatternIsMutable();
       pattern_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1858,19 +1806,14 @@ public Builder setPattern(int index, java.lang.String value) {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1888,7 +1831,6 @@ public Builder addPattern(java.lang.String value) {
       }
       ensurePatternIsMutable();
       pattern_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1898,19 +1840,14 @@ public Builder addPattern(java.lang.String value) {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1925,7 +1862,6 @@ public Builder addPattern(java.lang.String value) {
     public Builder addAllPattern(java.lang.Iterable<java.lang.String> values) {
       ensurePatternIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, pattern_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1935,19 +1871,14 @@ public Builder addAllPattern(java.lang.Iterable<java.lang.String> values) {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -1959,9 +1890,8 @@ public Builder addAllPattern(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearPattern() {
-      pattern_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      ;
       onChanged();
       return this;
     }
@@ -1971,19 +1901,14 @@ public Builder clearPattern() {
      * <pre>
      * Optional. The relative resource name pattern associated with this resource
      * type. The DNS prefix of the full resource name shouldn't be specified here.
-     *
      * The path pattern must follow the syntax, which aligns with HTTP binding
      * syntax:
-     *
      *     Template = Segment { "/" Segment } ;
      *     Segment = LITERAL | Variable ;
      *     Variable = "{" LITERAL "}" ;
-     *
      * Examples:
-     *
      *     - "projects/{project}/topics/{topic}"
      *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-     *
      * The components in braces correspond to the IDs for each resource in the
      * hierarchy. It is expected that, if multiple patterns are provided,
      * the same component name (e.g. "project") refers to IDs of the same
@@ -2002,7 +1927,6 @@ public Builder addPatternBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensurePatternIsMutable();
       pattern_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2124,9 +2048,7 @@ public Builder setNameFieldBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Optional. The historical or future-looking state of the resource pattern.
-     *
      * Example:
-     *
      *     // The InspectTemplate message originally only supported resource
      *     // names with organization, and project was added later.
      *     message InspectTemplate {
@@ -2153,9 +2075,7 @@ public int getHistoryValue() {
      *
      * <pre>
      * Optional. The historical or future-looking state of the resource pattern.
-     *
      * Example:
-     *
      *     // The InspectTemplate message originally only supported resource
      *     // names with organization, and project was added later.
      *     message InspectTemplate {
@@ -2185,9 +2105,7 @@ public Builder setHistoryValue(int value) {
      *
      * <pre>
      * Optional. The historical or future-looking state of the resource pattern.
-     *
      * Example:
-     *
      *     // The InspectTemplate message originally only supported resource
      *     // names with organization, and project was added later.
      *     message InspectTemplate {
@@ -2216,9 +2134,7 @@ public com.google.api.ResourceDescriptor.History getHistory() {
      *
      * <pre>
      * Optional. The historical or future-looking state of the resource pattern.
-     *
      * Example:
-     *
      *     // The InspectTemplate message originally only supported resource
      *     // names with organization, and project was added later.
      *     message InspectTemplate {
@@ -2251,9 +2167,7 @@ public Builder setHistory(com.google.api.ResourceDescriptor.History value) {
      *
      * <pre>
      * Optional. The historical or future-looking state of the resource pattern.
-     *
      * Example:
-     *
      *     // The InspectTemplate message originally only supported resource
      *     // names with organization, and project was added later.
      *     message InspectTemplate {
@@ -2288,7 +2202,6 @@ public Builder clearHistory() {
      * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
      * concept of the `plural` field in k8s CRD spec
      * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-     *
      * Note: The plural form is required even for singleton resources. See
      * https://aip.dev/156
      * </pre>
@@ -2317,7 +2230,6 @@ public java.lang.String getPlural() {
      * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
      * concept of the `plural` field in k8s CRD spec
      * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-     *
      * Note: The plural form is required even for singleton resources. See
      * https://aip.dev/156
      * </pre>
@@ -2346,7 +2258,6 @@ public com.google.protobuf.ByteString getPluralBytes() {
      * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
      * concept of the `plural` field in k8s CRD spec
      * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-     *
      * Note: The plural form is required even for singleton resources. See
      * https://aip.dev/156
      * </pre>
@@ -2374,7 +2285,6 @@ public Builder setPlural(java.lang.String value) {
      * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
      * concept of the `plural` field in k8s CRD spec
      * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-     *
      * Note: The plural form is required even for singleton resources. See
      * https://aip.dev/156
      * </pre>
@@ -2398,7 +2308,6 @@ public Builder clearPlural() {
      * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
      * concept of the `plural` field in k8s CRD spec
      * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-     *
      * Note: The plural form is required even for singleton resources. See
      * https://aip.dev/156
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptorOrBuilder.java
index 2c0099fcda..3e9739257d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptorOrBuilder.java
@@ -30,9 +30,7 @@ public interface ResourceDescriptorOrBuilder
    * The resource type. It must be in the format of
    * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
    * singular and must not include version numbers.
-   *
    * Example: `storage.googleapis.com/Bucket`
-   *
    * The value of the resource_type_kind must follow the regular expression
    * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
    * should use PascalCase (UpperCamelCase). The maximum number of
@@ -51,9 +49,7 @@ public interface ResourceDescriptorOrBuilder
    * The resource type. It must be in the format of
    * {service_name}/{resource_type_kind}. The `resource_type_kind` must be
    * singular and must not include version numbers.
-   *
    * Example: `storage.googleapis.com/Bucket`
-   *
    * The value of the resource_type_kind must follow the regular expression
    * /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
    * should use PascalCase (UpperCamelCase). The maximum number of
@@ -72,19 +68,14 @@ public interface ResourceDescriptorOrBuilder
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -102,19 +93,14 @@ public interface ResourceDescriptorOrBuilder
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -132,19 +118,14 @@ public interface ResourceDescriptorOrBuilder
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -163,19 +144,14 @@ public interface ResourceDescriptorOrBuilder
    * <pre>
    * Optional. The relative resource name pattern associated with this resource
    * type. The DNS prefix of the full resource name shouldn't be specified here.
-   *
    * The path pattern must follow the syntax, which aligns with HTTP binding
    * syntax:
-   *
    *     Template = Segment { "/" Segment } ;
    *     Segment = LITERAL | Variable ;
    *     Variable = "{" LITERAL "}" ;
-   *
    * Examples:
-   *
    *     - "projects/{project}/topics/{topic}"
    *     - "projects/{project}/knowledgeBases/{knowledge_base}"
-   *
    * The components in braces correspond to the IDs for each resource in the
    * hierarchy. It is expected that, if multiple patterns are provided,
    * the same component name (e.g. "project") refers to IDs of the same
@@ -221,9 +197,7 @@ public interface ResourceDescriptorOrBuilder
    *
    * <pre>
    * Optional. The historical or future-looking state of the resource pattern.
-   *
    * Example:
-   *
    *     // The InspectTemplate message originally only supported resource
    *     // names with organization, and project was added later.
    *     message InspectTemplate {
@@ -247,9 +221,7 @@ public interface ResourceDescriptorOrBuilder
    *
    * <pre>
    * Optional. The historical or future-looking state of the resource pattern.
-   *
    * Example:
-   *
    *     // The InspectTemplate message originally only supported resource
    *     // names with organization, and project was added later.
    *     message InspectTemplate {
@@ -278,7 +250,6 @@ public interface ResourceDescriptorOrBuilder
    * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
    * concept of the `plural` field in k8s CRD spec
    * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-   *
    * Note: The plural form is required even for singleton resources. See
    * https://aip.dev/156
    * </pre>
@@ -297,7 +268,6 @@ public interface ResourceDescriptorOrBuilder
    * name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
    * concept of the `plural` field in k8s CRD spec
    * https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-   *
    * Note: The plural form is required even for singleton resources. See
    * https://aip.dev/156
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java
index d72f23cbd7..fbf2c0127d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResourceReference();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ResourceProto.internal_static_google_api_ResourceReference_descriptor;
   }
@@ -71,20 +76,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * The resource type that the annotated field references.
-   *
    * Example:
-   *
    *     message Subscription {
    *       string topic = 2 [(google.api.resource_reference) = {
    *         type: "pubsub.googleapis.com/Topic"
    *       }];
    *     }
-   *
    * Occasionally, a field may reference an arbitrary resource. In this case,
    * APIs use the special value * in their resource reference.
-   *
    * Example:
-   *
    *     message GetIamPolicyRequest {
    *       string resource = 2 [(google.api.resource_reference) = {
    *         type: "*"
@@ -113,20 +113,15 @@ public java.lang.String getType() {
    *
    * <pre>
    * The resource type that the annotated field references.
-   *
    * Example:
-   *
    *     message Subscription {
    *       string topic = 2 [(google.api.resource_reference) = {
    *         type: "pubsub.googleapis.com/Topic"
    *       }];
    *     }
-   *
    * Occasionally, a field may reference an arbitrary resource. In this case,
    * APIs use the special value * in their resource reference.
-   *
    * Example:
-   *
    *     message GetIamPolicyRequest {
    *       string resource = 2 [(google.api.resource_reference) = {
    *         type: "*"
@@ -162,9 +157,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
    * The resource type of a child collection that the annotated field
    * references. This is useful for annotating the `parent` field that
    * doesn't have a fixed resource type.
-   *
    * Example:
-   *
    *     message ListLogEntriesRequest {
    *       string parent = 1 [(google.api.resource_reference) = {
    *         child_type: "logging.googleapis.com/LogEntry"
@@ -195,9 +188,7 @@ public java.lang.String getChildType() {
    * The resource type of a child collection that the annotated field
    * references. This is useful for annotating the `parent` field that
    * doesn't have a fixed resource type.
-   *
    * Example:
-   *
    *     message ListLogEntriesRequest {
    *       string parent = 1 [(google.api.resource_reference) = {
    *         child_type: "logging.googleapis.com/LogEntry"
@@ -471,6 +462,39 @@ private void buildPartial0(com.google.api.ResourceReference result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.ResourceReference) {
@@ -556,20 +580,15 @@ public Builder mergeFrom(
      *
      * <pre>
      * The resource type that the annotated field references.
-     *
      * Example:
-     *
      *     message Subscription {
      *       string topic = 2 [(google.api.resource_reference) = {
      *         type: "pubsub.googleapis.com/Topic"
      *       }];
      *     }
-     *
      * Occasionally, a field may reference an arbitrary resource. In this case,
      * APIs use the special value * in their resource reference.
-     *
      * Example:
-     *
      *     message GetIamPolicyRequest {
      *       string resource = 2 [(google.api.resource_reference) = {
      *         type: "*"
@@ -597,20 +616,15 @@ public java.lang.String getType() {
      *
      * <pre>
      * The resource type that the annotated field references.
-     *
      * Example:
-     *
      *     message Subscription {
      *       string topic = 2 [(google.api.resource_reference) = {
      *         type: "pubsub.googleapis.com/Topic"
      *       }];
      *     }
-     *
      * Occasionally, a field may reference an arbitrary resource. In this case,
      * APIs use the special value * in their resource reference.
-     *
      * Example:
-     *
      *     message GetIamPolicyRequest {
      *       string resource = 2 [(google.api.resource_reference) = {
      *         type: "*"
@@ -638,20 +652,15 @@ public com.google.protobuf.ByteString getTypeBytes() {
      *
      * <pre>
      * The resource type that the annotated field references.
-     *
      * Example:
-     *
      *     message Subscription {
      *       string topic = 2 [(google.api.resource_reference) = {
      *         type: "pubsub.googleapis.com/Topic"
      *       }];
      *     }
-     *
      * Occasionally, a field may reference an arbitrary resource. In this case,
      * APIs use the special value * in their resource reference.
-     *
      * Example:
-     *
      *     message GetIamPolicyRequest {
      *       string resource = 2 [(google.api.resource_reference) = {
      *         type: "*"
@@ -678,20 +687,15 @@ public Builder setType(java.lang.String value) {
      *
      * <pre>
      * The resource type that the annotated field references.
-     *
      * Example:
-     *
      *     message Subscription {
      *       string topic = 2 [(google.api.resource_reference) = {
      *         type: "pubsub.googleapis.com/Topic"
      *       }];
      *     }
-     *
      * Occasionally, a field may reference an arbitrary resource. In this case,
      * APIs use the special value * in their resource reference.
-     *
      * Example:
-     *
      *     message GetIamPolicyRequest {
      *       string resource = 2 [(google.api.resource_reference) = {
      *         type: "*"
@@ -714,20 +718,15 @@ public Builder clearType() {
      *
      * <pre>
      * The resource type that the annotated field references.
-     *
      * Example:
-     *
      *     message Subscription {
      *       string topic = 2 [(google.api.resource_reference) = {
      *         type: "pubsub.googleapis.com/Topic"
      *       }];
      *     }
-     *
      * Occasionally, a field may reference an arbitrary resource. In this case,
      * APIs use the special value * in their resource reference.
-     *
      * Example:
-     *
      *     message GetIamPolicyRequest {
      *       string resource = 2 [(google.api.resource_reference) = {
      *         type: "*"
@@ -759,9 +758,7 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
      * The resource type of a child collection that the annotated field
      * references. This is useful for annotating the `parent` field that
      * doesn't have a fixed resource type.
-     *
      * Example:
-     *
      *     message ListLogEntriesRequest {
      *       string parent = 1 [(google.api.resource_reference) = {
      *         child_type: "logging.googleapis.com/LogEntry"
@@ -791,9 +788,7 @@ public java.lang.String getChildType() {
      * The resource type of a child collection that the annotated field
      * references. This is useful for annotating the `parent` field that
      * doesn't have a fixed resource type.
-     *
      * Example:
-     *
      *     message ListLogEntriesRequest {
      *       string parent = 1 [(google.api.resource_reference) = {
      *         child_type: "logging.googleapis.com/LogEntry"
@@ -823,9 +818,7 @@ public com.google.protobuf.ByteString getChildTypeBytes() {
      * The resource type of a child collection that the annotated field
      * references. This is useful for annotating the `parent` field that
      * doesn't have a fixed resource type.
-     *
      * Example:
-     *
      *     message ListLogEntriesRequest {
      *       string parent = 1 [(google.api.resource_reference) = {
      *         child_type: "logging.googleapis.com/LogEntry"
@@ -854,9 +847,7 @@ public Builder setChildType(java.lang.String value) {
      * The resource type of a child collection that the annotated field
      * references. This is useful for annotating the `parent` field that
      * doesn't have a fixed resource type.
-     *
      * Example:
-     *
      *     message ListLogEntriesRequest {
      *       string parent = 1 [(google.api.resource_reference) = {
      *         child_type: "logging.googleapis.com/LogEntry"
@@ -881,9 +872,7 @@ public Builder clearChildType() {
      * The resource type of a child collection that the annotated field
      * references. This is useful for annotating the `parent` field that
      * doesn't have a fixed resource type.
-     *
      * Example:
-     *
      *     message ListLogEntriesRequest {
      *       string parent = 1 [(google.api.resource_reference) = {
      *         child_type: "logging.googleapis.com/LogEntry"
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReferenceOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReferenceOrBuilder.java
index b056273f7c..d7ad517359 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReferenceOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReferenceOrBuilder.java
@@ -28,20 +28,15 @@ public interface ResourceReferenceOrBuilder
    *
    * <pre>
    * The resource type that the annotated field references.
-   *
    * Example:
-   *
    *     message Subscription {
    *       string topic = 2 [(google.api.resource_reference) = {
    *         type: "pubsub.googleapis.com/Topic"
    *       }];
    *     }
-   *
    * Occasionally, a field may reference an arbitrary resource. In this case,
    * APIs use the special value * in their resource reference.
-   *
    * Example:
-   *
    *     message GetIamPolicyRequest {
    *       string resource = 2 [(google.api.resource_reference) = {
    *         type: "*"
@@ -59,20 +54,15 @@ public interface ResourceReferenceOrBuilder
    *
    * <pre>
    * The resource type that the annotated field references.
-   *
    * Example:
-   *
    *     message Subscription {
    *       string topic = 2 [(google.api.resource_reference) = {
    *         type: "pubsub.googleapis.com/Topic"
    *       }];
    *     }
-   *
    * Occasionally, a field may reference an arbitrary resource. In this case,
    * APIs use the special value * in their resource reference.
-   *
    * Example:
-   *
    *     message GetIamPolicyRequest {
    *       string resource = 2 [(google.api.resource_reference) = {
    *         type: "*"
@@ -93,9 +83,7 @@ public interface ResourceReferenceOrBuilder
    * The resource type of a child collection that the annotated field
    * references. This is useful for annotating the `parent` field that
    * doesn't have a fixed resource type.
-   *
    * Example:
-   *
    *     message ListLogEntriesRequest {
    *       string parent = 1 [(google.api.resource_reference) = {
    *         child_type: "logging.googleapis.com/LogEntry"
@@ -115,9 +103,7 @@ public interface ResourceReferenceOrBuilder
    * The resource type of a child collection that the annotated field
    * references. This is useful for annotating the `parent` field that
    * doesn't have a fixed resource type.
-   *
    * Example:
-   *
    *     message ListLogEntriesRequest {
    *       string parent = 1 [(google.api.resource_reference) = {
    *         child_type: "logging.googleapis.com/LogEntry"
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java
index 0c508233cd..d5d05e0ab3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RoutingParameter();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.RoutingProto.internal_static_google_api_RoutingParameter_descriptor;
   }
@@ -129,9 +134,7 @@ public com.google.protobuf.ByteString getFieldBytes() {
    * - the name of the single named segment will be used as a header name,
    * - the match value of the segment will be used as a header value;
    * if the match is NOT successful, nothing will be sent.
-   *
    * Example:
-   *
    *               -- This is a field in the request message
    *              |   that the header value will be extracted from.
    *              |
@@ -148,7 +151,6 @@ public com.google.protobuf.ByteString getFieldBytes() {
    *                                                             |
    *      The string in the field must match the whole pattern --
    *      before brackets, inside brackets, after brackets.
-   *
    * When looking at this specific example, we can see that:
    * - A key-value pair with the key `table_location`
    *   and the value matching `instances/&#42;` should be added
@@ -156,23 +158,18 @@ public com.google.protobuf.ByteString getFieldBytes() {
    * - The value is extracted from the request message's `table_name` field
    *   if it matches the full pattern specified:
    *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-   *
    * **NB:** If the `path_template` field is not provided, the key name is
    * equal to the field name, and the whole field should be sent as a value.
    * This makes the pattern for the field and the value functionally equivalent
    * to `**`, and the configuration
-   *
    *     {
    *       field: "table_name"
    *     }
-   *
    * is a functionally equivalent shorthand to:
-   *
    *     {
    *       field: "table_name"
    *       path_template: "{table_name=**}"
    *     }
-   *
    * See Example 1 for more details.
    * </pre>
    *
@@ -205,9 +202,7 @@ public java.lang.String getPathTemplate() {
    * - the name of the single named segment will be used as a header name,
    * - the match value of the segment will be used as a header value;
    * if the match is NOT successful, nothing will be sent.
-   *
    * Example:
-   *
    *               -- This is a field in the request message
    *              |   that the header value will be extracted from.
    *              |
@@ -224,7 +219,6 @@ public java.lang.String getPathTemplate() {
    *                                                             |
    *      The string in the field must match the whole pattern --
    *      before brackets, inside brackets, after brackets.
-   *
    * When looking at this specific example, we can see that:
    * - A key-value pair with the key `table_location`
    *   and the value matching `instances/&#42;` should be added
@@ -232,23 +226,18 @@ public java.lang.String getPathTemplate() {
    * - The value is extracted from the request message's `table_name` field
    *   if it matches the full pattern specified:
    *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-   *
    * **NB:** If the `path_template` field is not provided, the key name is
    * equal to the field name, and the whole field should be sent as a value.
    * This makes the pattern for the field and the value functionally equivalent
    * to `**`, and the configuration
-   *
    *     {
    *       field: "table_name"
    *     }
-   *
    * is a functionally equivalent shorthand to:
-   *
    *     {
    *       field: "table_name"
    *       path_template: "{table_name=**}"
    *     }
-   *
    * See Example 1 for more details.
    * </pre>
    *
@@ -516,6 +505,39 @@ private void buildPartial0(com.google.api.RoutingParameter result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.RoutingParameter) {
@@ -715,9 +737,7 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
      * - the name of the single named segment will be used as a header name,
      * - the match value of the segment will be used as a header value;
      * if the match is NOT successful, nothing will be sent.
-     *
      * Example:
-     *
      *               -- This is a field in the request message
      *              |   that the header value will be extracted from.
      *              |
@@ -734,7 +754,6 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
      *                                                             |
      *      The string in the field must match the whole pattern --
      *      before brackets, inside brackets, after brackets.
-     *
      * When looking at this specific example, we can see that:
      * - A key-value pair with the key `table_location`
      *   and the value matching `instances/&#42;` should be added
@@ -742,23 +761,18 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
      * - The value is extracted from the request message's `table_name` field
      *   if it matches the full pattern specified:
      *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-     *
      * **NB:** If the `path_template` field is not provided, the key name is
      * equal to the field name, and the whole field should be sent as a value.
      * This makes the pattern for the field and the value functionally equivalent
      * to `**`, and the configuration
-     *
      *     {
      *       field: "table_name"
      *     }
-     *
      * is a functionally equivalent shorthand to:
-     *
      *     {
      *       field: "table_name"
      *       path_template: "{table_name=**}"
      *     }
-     *
      * See Example 1 for more details.
      * </pre>
      *
@@ -790,9 +804,7 @@ public java.lang.String getPathTemplate() {
      * - the name of the single named segment will be used as a header name,
      * - the match value of the segment will be used as a header value;
      * if the match is NOT successful, nothing will be sent.
-     *
      * Example:
-     *
      *               -- This is a field in the request message
      *              |   that the header value will be extracted from.
      *              |
@@ -809,7 +821,6 @@ public java.lang.String getPathTemplate() {
      *                                                             |
      *      The string in the field must match the whole pattern --
      *      before brackets, inside brackets, after brackets.
-     *
      * When looking at this specific example, we can see that:
      * - A key-value pair with the key `table_location`
      *   and the value matching `instances/&#42;` should be added
@@ -817,23 +828,18 @@ public java.lang.String getPathTemplate() {
      * - The value is extracted from the request message's `table_name` field
      *   if it matches the full pattern specified:
      *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-     *
      * **NB:** If the `path_template` field is not provided, the key name is
      * equal to the field name, and the whole field should be sent as a value.
      * This makes the pattern for the field and the value functionally equivalent
      * to `**`, and the configuration
-     *
      *     {
      *       field: "table_name"
      *     }
-     *
      * is a functionally equivalent shorthand to:
-     *
      *     {
      *       field: "table_name"
      *       path_template: "{table_name=**}"
      *     }
-     *
      * See Example 1 for more details.
      * </pre>
      *
@@ -865,9 +871,7 @@ public com.google.protobuf.ByteString getPathTemplateBytes() {
      * - the name of the single named segment will be used as a header name,
      * - the match value of the segment will be used as a header value;
      * if the match is NOT successful, nothing will be sent.
-     *
      * Example:
-     *
      *               -- This is a field in the request message
      *              |   that the header value will be extracted from.
      *              |
@@ -884,7 +888,6 @@ public com.google.protobuf.ByteString getPathTemplateBytes() {
      *                                                             |
      *      The string in the field must match the whole pattern --
      *      before brackets, inside brackets, after brackets.
-     *
      * When looking at this specific example, we can see that:
      * - A key-value pair with the key `table_location`
      *   and the value matching `instances/&#42;` should be added
@@ -892,23 +895,18 @@ public com.google.protobuf.ByteString getPathTemplateBytes() {
      * - The value is extracted from the request message's `table_name` field
      *   if it matches the full pattern specified:
      *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-     *
      * **NB:** If the `path_template` field is not provided, the key name is
      * equal to the field name, and the whole field should be sent as a value.
      * This makes the pattern for the field and the value functionally equivalent
      * to `**`, and the configuration
-     *
      *     {
      *       field: "table_name"
      *     }
-     *
      * is a functionally equivalent shorthand to:
-     *
      *     {
      *       field: "table_name"
      *       path_template: "{table_name=**}"
      *     }
-     *
      * See Example 1 for more details.
      * </pre>
      *
@@ -939,9 +937,7 @@ public Builder setPathTemplate(java.lang.String value) {
      * - the name of the single named segment will be used as a header name,
      * - the match value of the segment will be used as a header value;
      * if the match is NOT successful, nothing will be sent.
-     *
      * Example:
-     *
      *               -- This is a field in the request message
      *              |   that the header value will be extracted from.
      *              |
@@ -958,7 +954,6 @@ public Builder setPathTemplate(java.lang.String value) {
      *                                                             |
      *      The string in the field must match the whole pattern --
      *      before brackets, inside brackets, after brackets.
-     *
      * When looking at this specific example, we can see that:
      * - A key-value pair with the key `table_location`
      *   and the value matching `instances/&#42;` should be added
@@ -966,23 +961,18 @@ public Builder setPathTemplate(java.lang.String value) {
      * - The value is extracted from the request message's `table_name` field
      *   if it matches the full pattern specified:
      *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-     *
      * **NB:** If the `path_template` field is not provided, the key name is
      * equal to the field name, and the whole field should be sent as a value.
      * This makes the pattern for the field and the value functionally equivalent
      * to `**`, and the configuration
-     *
      *     {
      *       field: "table_name"
      *     }
-     *
      * is a functionally equivalent shorthand to:
-     *
      *     {
      *       field: "table_name"
      *       path_template: "{table_name=**}"
      *     }
-     *
      * See Example 1 for more details.
      * </pre>
      *
@@ -1009,9 +999,7 @@ public Builder clearPathTemplate() {
      * - the name of the single named segment will be used as a header name,
      * - the match value of the segment will be used as a header value;
      * if the match is NOT successful, nothing will be sent.
-     *
      * Example:
-     *
      *               -- This is a field in the request message
      *              |   that the header value will be extracted from.
      *              |
@@ -1028,7 +1016,6 @@ public Builder clearPathTemplate() {
      *                                                             |
      *      The string in the field must match the whole pattern --
      *      before brackets, inside brackets, after brackets.
-     *
      * When looking at this specific example, we can see that:
      * - A key-value pair with the key `table_location`
      *   and the value matching `instances/&#42;` should be added
@@ -1036,23 +1023,18 @@ public Builder clearPathTemplate() {
      * - The value is extracted from the request message's `table_name` field
      *   if it matches the full pattern specified:
      *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-     *
      * **NB:** If the `path_template` field is not provided, the key name is
      * equal to the field name, and the whole field should be sent as a value.
      * This makes the pattern for the field and the value functionally equivalent
      * to `**`, and the configuration
-     *
      *     {
      *       field: "table_name"
      *     }
-     *
      * is a functionally equivalent shorthand to:
-     *
      *     {
      *       field: "table_name"
      *       path_template: "{table_name=**}"
      *     }
-     *
      * See Example 1 for more details.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameterOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameterOrBuilder.java
index 1d441400e9..cb948dbd18 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameterOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameterOrBuilder.java
@@ -61,9 +61,7 @@ public interface RoutingParameterOrBuilder
    * - the name of the single named segment will be used as a header name,
    * - the match value of the segment will be used as a header value;
    * if the match is NOT successful, nothing will be sent.
-   *
    * Example:
-   *
    *               -- This is a field in the request message
    *              |   that the header value will be extracted from.
    *              |
@@ -80,7 +78,6 @@ public interface RoutingParameterOrBuilder
    *                                                             |
    *      The string in the field must match the whole pattern --
    *      before brackets, inside brackets, after brackets.
-   *
    * When looking at this specific example, we can see that:
    * - A key-value pair with the key `table_location`
    *   and the value matching `instances/&#42;` should be added
@@ -88,23 +85,18 @@ public interface RoutingParameterOrBuilder
    * - The value is extracted from the request message's `table_name` field
    *   if it matches the full pattern specified:
    *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-   *
    * **NB:** If the `path_template` field is not provided, the key name is
    * equal to the field name, and the whole field should be sent as a value.
    * This makes the pattern for the field and the value functionally equivalent
    * to `**`, and the configuration
-   *
    *     {
    *       field: "table_name"
    *     }
-   *
    * is a functionally equivalent shorthand to:
-   *
    *     {
    *       field: "table_name"
    *       path_template: "{table_name=**}"
    *     }
-   *
    * See Example 1 for more details.
    * </pre>
    *
@@ -126,9 +118,7 @@ public interface RoutingParameterOrBuilder
    * - the name of the single named segment will be used as a header name,
    * - the match value of the segment will be used as a header value;
    * if the match is NOT successful, nothing will be sent.
-   *
    * Example:
-   *
    *               -- This is a field in the request message
    *              |   that the header value will be extracted from.
    *              |
@@ -145,7 +135,6 @@ public interface RoutingParameterOrBuilder
    *                                                             |
    *      The string in the field must match the whole pattern --
    *      before brackets, inside brackets, after brackets.
-   *
    * When looking at this specific example, we can see that:
    * - A key-value pair with the key `table_location`
    *   and the value matching `instances/&#42;` should be added
@@ -153,23 +142,18 @@ public interface RoutingParameterOrBuilder
    * - The value is extracted from the request message's `table_name` field
    *   if it matches the full pattern specified:
    *   `projects/&#42;&#47;instances/&#42;&#47;tables/&#42;`.
-   *
    * **NB:** If the `path_template` field is not provided, the key name is
    * equal to the field name, and the whole field should be sent as a value.
    * This makes the pattern for the field and the value functionally equivalent
    * to `**`, and the configuration
-   *
    *     {
    *       field: "table_name"
    *     }
-   *
    * is a functionally equivalent shorthand to:
-   *
    *     {
    *       field: "table_name"
    *       path_template: "{table_name=**}"
    *     }
-   *
    * See Example 1 for more details.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java
index 2228983941..4b2708dd3a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java
@@ -25,11 +25,8 @@
  * Specifies the routing information that should be sent along with the request
  * in the form of routing header.
  * **NOTE:** All service configuration rules follow the "last one wins" order.
- *
  * The examples below will apply to an RPC which has the following request type:
- *
  * Message Definition:
- *
  *     message Request {
  *       // The name of the Table
  *       // Values can be of the following formats:
@@ -37,51 +34,37 @@
  *       // - `projects/&lt;project&gt;/instances/&lt;instance&gt;/tables/&lt;table&gt;`
  *       // - `region/&lt;region&gt;/zones/&lt;zone&gt;/tables/&lt;table&gt;`
  *       string table_name = 1;
- *
  *       // This value specifies routing for replication.
  *       // It can be in the following formats:
  *       // - `profiles/&lt;profile_id&gt;`
  *       // - a legacy `profile_id` that can be any string
  *       string app_profile_id = 2;
  *     }
- *
  * Example message:
- *
  *     {
  *       table_name: projects/proj_foo/instances/instance_bar/table/table_baz,
  *       app_profile_id: profiles/prof_qux
  *     }
- *
  * The routing header consists of one or multiple key-value pairs. Every key
  * and value must be percent-encoded, and joined together in the format of
  * `key1=value1&amp;key2=value2`.
  * In the examples below I am skipping the percent-encoding for readablity.
- *
  * Example 1
- *
  * Extracting a field from the request to put into the routing header
  * unchanged, with the key equal to the field name.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // Take the `app_profile_id`.
  *       routing_parameters {
  *         field: "app_profile_id"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params: app_profile_id=profiles/prof_qux
- *
  * Example 2
- *
  * Extracting a field from the request to put into the routing header
  * unchanged, with the key different from the field name.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // Take the `app_profile_id`, but name it `routing_id` in the header.
  *       routing_parameters {
@@ -89,25 +72,16 @@
  *         path_template: "{routing_id=**}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params: routing_id=profiles/prof_qux
- *
  * Example 3
- *
  * Extracting a field from the request to put into the routing
  * header, while matching a path template syntax on the field's value.
- *
  * NB: it is more useful to send nothing than to send garbage for the purpose
  * of dynamic routing, since garbage pollutes cache. Thus the matching.
- *
  * Sub-example 3a
- *
  * The field matches the template.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // Take the `table_name`, if it's well-formed (with project-based
  *       // syntax).
@@ -116,18 +90,12 @@
  *         path_template: "{table_name=projects/&#42;&#47;instances/&#42;&#47;&#42;*}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     table_name=projects/proj_foo/instances/instance_bar/table/table_baz
- *
  * Sub-example 3b
- *
  * The field does not match the template.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // Take the `table_name`, if it's well-formed (with region-based
  *       // syntax).
@@ -136,22 +104,15 @@
  *         path_template: "{table_name=regions/&#42;&#47;zones/&#42;&#47;&#42;*}"
  *       }
  *     };
- *
  * result:
- *
  *     &lt;no routing header will be sent&gt;
- *
  * Sub-example 3c
- *
  * Multiple alternative conflictingly named path templates are
  * specified. The one that matches is used to construct the header.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // Take the `table_name`, if it's well-formed, whether
  *       // using the region- or projects-based syntax.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "{table_name=regions/&#42;&#47;zones/&#42;&#47;&#42;*}"
@@ -161,19 +122,13 @@
  *         path_template: "{table_name=projects/&#42;&#47;instances/&#42;&#47;&#42;*}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     table_name=projects/proj_foo/instances/instance_bar/table/table_baz
- *
  * Example 4
- *
  * Extracting a single routing header key-value pair by matching a
  * template syntax on (a part of) a single request field.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // Take just the project id from the `table_name` field.
  *       routing_parameters {
@@ -181,24 +136,17 @@
  *         path_template: "{routing_id=projects/&#42;}/&#42;*"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params: routing_id=projects/proj_foo
- *
  * Example 5
- *
  * Extracting a single routing header key-value pair by matching
  * several conflictingly named path templates on (parts of) a single request
  * field. The last template to match "wins" the conflict.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // If the `table_name` does not have instances information,
  *       // take just the project id for routing.
  *       // Otherwise take project + instance.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "{routing_id=projects/&#42;}/&#42;*"
@@ -208,29 +156,20 @@
  *         path_template: "{routing_id=projects/&#42;&#47;instances/&#42;}/&#42;*"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     routing_id=projects/proj_foo/instances/instance_bar
- *
  * Example 6
- *
  * Extracting multiple routing header key-value pairs by matching
  * several non-conflicting path templates on (parts of) a single request field.
- *
  * Sub-example 6a
- *
  * Make the templates strict, so that if the `table_name` does not
  * have an instance information, nothing is sent.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // The routing code needs two keys instead of one composite
  *       // but works only for the tables with the "project-instance" name
  *       // syntax.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "{project_id=projects/&#42;}/instances/&#42;&#47;&#42;*"
@@ -240,24 +179,17 @@
  *         path_template: "projects/&#42;&#47;{instance_id=instances/&#42;}/&#42;*"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     project_id=projects/proj_foo&amp;instance_id=instances/instance_bar
- *
  * Sub-example 6b
- *
  * Make the templates loose, so that if the `table_name` does not
  * have an instance information, just the project id part is sent.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // The routing code wants two keys instead of one composite
  *       // but will work with just the `project_id` for tables without
  *       // an instance in the `table_name`.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "{project_id=projects/&#42;}/&#42;*"
@@ -267,30 +199,22 @@
  *         path_template: "projects/&#42;&#47;{instance_id=instances/&#42;}/&#42;*"
  *       }
  *     };
- *
  * result (is the same as 6a for our example message because it has the instance
  * information):
- *
  *     x-goog-request-params:
  *     project_id=projects/proj_foo&amp;instance_id=instances/instance_bar
- *
  * Example 7
- *
  * Extracting multiple routing header key-value pairs by matching
  * several path templates on multiple request fields.
- *
  * NB: note that here there is no way to specify sending nothing if one of the
  * fields does not match its template. E.g. if the `table_name` is in the wrong
  * format, the `project_id` will not be sent, but the `routing_id` will be.
  * The backend routing code has to be aware of that and be prepared to not
  * receive a full complement of keys if it expects multiple.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // The routing needs both `project_id` and `routing_id`
  *       // (from the `app_profile_id` field) for routing.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "{project_id=projects/&#42;}/&#42;*"
@@ -300,25 +224,18 @@
  *         path_template: "{routing_id=**}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     project_id=projects/proj_foo&amp;routing_id=profiles/prof_qux
- *
  * Example 8
- *
  * Extracting a single routing header key-value pair by matching
  * several conflictingly named path templates on several request fields. The
  * last template to match "wins" the conflict.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // The `routing_id` can be a project id or a region id depending on
  *       // the table name format, but only if the `app_profile_id` is not set.
  *       // If `app_profile_id` is set it should be used instead.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "{routing_id=projects/&#42;}/&#42;*"
@@ -332,17 +249,11 @@
  *         path_template: "{routing_id=**}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params: routing_id=profiles/prof_qux
- *
  * Example 9
- *
  * Bringing it all together.
- *
  * annotation:
- *
  *     option (google.api.routing) = {
  *       // For routing both `table_location` and a `routing_id` are needed.
  *       //
@@ -354,7 +265,6 @@
  *       // - If it's any other literal, send it as is.
  *       // If the `app_profile_id` is empty, and the `table_name` starts with
  *       // the project_id, send that instead.
- *
  *       routing_parameters {
  *         field: "table_name"
  *         path_template: "projects/&#42;&#47;{table_location=instances/&#42;}/tables/&#42;"
@@ -376,9 +286,7 @@
  *         path_template: "profiles/{routing_id=*}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     table_location=instances/instance_bar&amp;routing_id=prof_qux
  * </pre>
@@ -405,6 +313,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RoutingRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.RoutingProto.internal_static_google_api_RoutingRule_descriptor;
   }
@@ -680,11 +593,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Specifies the routing information that should be sent along with the request
    * in the form of routing header.
    * **NOTE:** All service configuration rules follow the "last one wins" order.
-   *
    * The examples below will apply to an RPC which has the following request type:
-   *
    * Message Definition:
-   *
    *     message Request {
    *       // The name of the Table
    *       // Values can be of the following formats:
@@ -692,51 +602,37 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       // - `projects/&lt;project&gt;/instances/&lt;instance&gt;/tables/&lt;table&gt;`
    *       // - `region/&lt;region&gt;/zones/&lt;zone&gt;/tables/&lt;table&gt;`
    *       string table_name = 1;
-   *
    *       // This value specifies routing for replication.
    *       // It can be in the following formats:
    *       // - `profiles/&lt;profile_id&gt;`
    *       // - a legacy `profile_id` that can be any string
    *       string app_profile_id = 2;
    *     }
-   *
    * Example message:
-   *
    *     {
    *       table_name: projects/proj_foo/instances/instance_bar/table/table_baz,
    *       app_profile_id: profiles/prof_qux
    *     }
-   *
    * The routing header consists of one or multiple key-value pairs. Every key
    * and value must be percent-encoded, and joined together in the format of
    * `key1=value1&amp;key2=value2`.
    * In the examples below I am skipping the percent-encoding for readablity.
-   *
    * Example 1
-   *
    * Extracting a field from the request to put into the routing header
    * unchanged, with the key equal to the field name.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // Take the `app_profile_id`.
    *       routing_parameters {
    *         field: "app_profile_id"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params: app_profile_id=profiles/prof_qux
-   *
    * Example 2
-   *
    * Extracting a field from the request to put into the routing header
    * unchanged, with the key different from the field name.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // Take the `app_profile_id`, but name it `routing_id` in the header.
    *       routing_parameters {
@@ -744,25 +640,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=**}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params: routing_id=profiles/prof_qux
-   *
    * Example 3
-   *
    * Extracting a field from the request to put into the routing
    * header, while matching a path template syntax on the field's value.
-   *
    * NB: it is more useful to send nothing than to send garbage for the purpose
    * of dynamic routing, since garbage pollutes cache. Thus the matching.
-   *
    * Sub-example 3a
-   *
    * The field matches the template.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // Take the `table_name`, if it's well-formed (with project-based
    *       // syntax).
@@ -771,18 +658,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{table_name=projects/&#42;&#47;instances/&#42;&#47;&#42;*}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     table_name=projects/proj_foo/instances/instance_bar/table/table_baz
-   *
    * Sub-example 3b
-   *
    * The field does not match the template.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // Take the `table_name`, if it's well-formed (with region-based
    *       // syntax).
@@ -791,22 +672,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{table_name=regions/&#42;&#47;zones/&#42;&#47;&#42;*}"
    *       }
    *     };
-   *
    * result:
-   *
    *     &lt;no routing header will be sent&gt;
-   *
    * Sub-example 3c
-   *
    * Multiple alternative conflictingly named path templates are
    * specified. The one that matches is used to construct the header.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // Take the `table_name`, if it's well-formed, whether
    *       // using the region- or projects-based syntax.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "{table_name=regions/&#42;&#47;zones/&#42;&#47;&#42;*}"
@@ -816,19 +690,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{table_name=projects/&#42;&#47;instances/&#42;&#47;&#42;*}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     table_name=projects/proj_foo/instances/instance_bar/table/table_baz
-   *
    * Example 4
-   *
    * Extracting a single routing header key-value pair by matching a
    * template syntax on (a part of) a single request field.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // Take just the project id from the `table_name` field.
    *       routing_parameters {
@@ -836,24 +704,17 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=projects/&#42;}/&#42;*"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params: routing_id=projects/proj_foo
-   *
    * Example 5
-   *
    * Extracting a single routing header key-value pair by matching
    * several conflictingly named path templates on (parts of) a single request
    * field. The last template to match "wins" the conflict.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // If the `table_name` does not have instances information,
    *       // take just the project id for routing.
    *       // Otherwise take project + instance.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "{routing_id=projects/&#42;}/&#42;*"
@@ -863,29 +724,20 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=projects/&#42;&#47;instances/&#42;}/&#42;*"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     routing_id=projects/proj_foo/instances/instance_bar
-   *
    * Example 6
-   *
    * Extracting multiple routing header key-value pairs by matching
    * several non-conflicting path templates on (parts of) a single request field.
-   *
    * Sub-example 6a
-   *
    * Make the templates strict, so that if the `table_name` does not
    * have an instance information, nothing is sent.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // The routing code needs two keys instead of one composite
    *       // but works only for the tables with the "project-instance" name
    *       // syntax.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "{project_id=projects/&#42;}/instances/&#42;&#47;&#42;*"
@@ -895,24 +747,17 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "projects/&#42;&#47;{instance_id=instances/&#42;}/&#42;*"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     project_id=projects/proj_foo&amp;instance_id=instances/instance_bar
-   *
    * Sub-example 6b
-   *
    * Make the templates loose, so that if the `table_name` does not
    * have an instance information, just the project id part is sent.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // The routing code wants two keys instead of one composite
    *       // but will work with just the `project_id` for tables without
    *       // an instance in the `table_name`.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "{project_id=projects/&#42;}/&#42;*"
@@ -922,30 +767,22 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "projects/&#42;&#47;{instance_id=instances/&#42;}/&#42;*"
    *       }
    *     };
-   *
    * result (is the same as 6a for our example message because it has the instance
    * information):
-   *
    *     x-goog-request-params:
    *     project_id=projects/proj_foo&amp;instance_id=instances/instance_bar
-   *
    * Example 7
-   *
    * Extracting multiple routing header key-value pairs by matching
    * several path templates on multiple request fields.
-   *
    * NB: note that here there is no way to specify sending nothing if one of the
    * fields does not match its template. E.g. if the `table_name` is in the wrong
    * format, the `project_id` will not be sent, but the `routing_id` will be.
    * The backend routing code has to be aware of that and be prepared to not
    * receive a full complement of keys if it expects multiple.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // The routing needs both `project_id` and `routing_id`
    *       // (from the `app_profile_id` field) for routing.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "{project_id=projects/&#42;}/&#42;*"
@@ -955,25 +792,18 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=**}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     project_id=projects/proj_foo&amp;routing_id=profiles/prof_qux
-   *
    * Example 8
-   *
    * Extracting a single routing header key-value pair by matching
    * several conflictingly named path templates on several request fields. The
    * last template to match "wins" the conflict.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // The `routing_id` can be a project id or a region id depending on
    *       // the table name format, but only if the `app_profile_id` is not set.
    *       // If `app_profile_id` is set it should be used instead.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "{routing_id=projects/&#42;}/&#42;*"
@@ -987,17 +817,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=**}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params: routing_id=profiles/prof_qux
-   *
    * Example 9
-   *
    * Bringing it all together.
-   *
    * annotation:
-   *
    *     option (google.api.routing) = {
    *       // For routing both `table_location` and a `routing_id` are needed.
    *       //
@@ -1009,7 +833,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       // - If it's any other literal, send it as is.
    *       // If the `app_profile_id` is empty, and the `table_name` starts with
    *       // the project_id, send that instead.
-   *
    *       routing_parameters {
    *         field: "table_name"
    *         path_template: "projects/&#42;&#47;{table_location=instances/&#42;}/tables/&#42;"
@@ -1031,9 +854,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "profiles/{routing_id=*}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     table_location=instances/instance_bar&amp;routing_id=prof_qux
    * </pre>
@@ -1123,6 +944,39 @@ private void buildPartial0(com.google.api.RoutingRule result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.RoutingRule) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettings.java
index 1ae4a6e461..68d515b3b6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettings.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RubySettings();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_RubySettings_descriptor;
   }
@@ -345,6 +350,39 @@ private void buildPartial0(com.google.api.RubySettings result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.RubySettings) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Service.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Service.java
index ccf1f83883..fac54578d0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Service.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Service.java
@@ -28,15 +28,12 @@
  * aspects to sub-sections. Each sub-section is either a proto message or a
  * repeated proto message that configures a specific aspect, such as auth.
  * For more information, see each proto message definition.
- *
  * Example:
- *
  *     type: google.api.Service
  *     name: calendar.googleapis.com
  *     title: Google Calendar API
  *     apis:
  *     - name: google.calendar.v3.Calendar
- *
  *     visibility:
  *       rules:
  *       - selector: "google.calendar.v3.*"
@@ -45,7 +42,6 @@
  *       rules:
  *       - selector: "google.calendar.v3.*"
  *         address: calendar.example.com
- *
  *     authentication:
  *       providers:
  *       - id: google_calendar_auth
@@ -89,6 +85,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Service();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ServiceProto.internal_static_google_api_Service_descriptor;
   }
@@ -422,7 +423,6 @@ public com.google.protobuf.ApiOrBuilder getApisOrBuilder(int index) {
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -442,7 +442,6 @@ public java.util.List<com.google.protobuf.Type> getTypesList() {
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -462,7 +461,6 @@ public java.util.List<? extends com.google.protobuf.TypeOrBuilder> getTypesOrBui
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -482,7 +480,6 @@ public int getTypesCount() {
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -502,7 +499,6 @@ public com.google.protobuf.Type getTypes(int index) {
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -526,7 +522,6 @@ public com.google.protobuf.TypeOrBuilder getTypesOrBuilder(int index) {
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -545,7 +540,6 @@ public java.util.List<com.google.protobuf.Enum> getEnumsList() {
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -564,7 +558,6 @@ public java.util.List<? extends com.google.protobuf.EnumOrBuilder> getEnumsOrBui
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -583,7 +576,6 @@ public int getEnumsCount() {
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -602,7 +594,6 @@ public com.google.protobuf.Enum getEnums(int index) {
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -1586,7 +1577,6 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
    *
    * <pre>
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * </pre>
@@ -1604,7 +1594,6 @@ public boolean hasConfigVersion() {
    *
    * <pre>
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * </pre>
@@ -1624,7 +1613,6 @@ public com.google.protobuf.UInt32Value getConfigVersion() {
    *
    * <pre>
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * </pre>
@@ -2120,15 +2108,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * aspects to sub-sections. Each sub-section is either a proto message or a
    * repeated proto message that configures a specific aspect, such as auth.
    * For more information, see each proto message definition.
-   *
    * Example:
-   *
    *     type: google.api.Service
    *     name: calendar.googleapis.com
    *     title: Google Calendar API
    *     apis:
    *     - name: google.calendar.v3.Calendar
-   *
    *     visibility:
    *       rules:
    *       - selector: "google.calendar.v3.*"
@@ -2137,7 +2122,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       rules:
    *       - selector: "google.calendar.v3.*"
    *         address: calendar.example.com
-   *
    *     authentication:
    *       providers:
    *       - id: google_calendar_auth
@@ -2470,6 +2454,39 @@ private void buildPartial0(com.google.api.Service result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Service) {
@@ -3877,7 +3894,6 @@ private void ensureTypesIsMutable() {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -3900,7 +3916,6 @@ public java.util.List<com.google.protobuf.Type> getTypesList() {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -3923,7 +3938,6 @@ public int getTypesCount() {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -3946,7 +3960,6 @@ public com.google.protobuf.Type getTypes(int index) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -3975,7 +3988,6 @@ public Builder setTypes(int index, com.google.protobuf.Type value) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4001,7 +4013,6 @@ public Builder setTypes(int index, com.google.protobuf.Type.Builder builderForVa
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4030,7 +4041,6 @@ public Builder addTypes(com.google.protobuf.Type value) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4059,7 +4069,6 @@ public Builder addTypes(int index, com.google.protobuf.Type value) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4085,7 +4094,6 @@ public Builder addTypes(com.google.protobuf.Type.Builder builderForValue) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4111,7 +4119,6 @@ public Builder addTypes(int index, com.google.protobuf.Type.Builder builderForVa
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4137,7 +4144,6 @@ public Builder addAllTypes(java.lang.Iterable<? extends com.google.protobuf.Type
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4163,7 +4169,6 @@ public Builder clearTypes() {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4189,7 +4194,6 @@ public Builder removeTypes(int index) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4208,7 +4212,6 @@ public com.google.protobuf.Type.Builder getTypesBuilder(int index) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4231,7 +4234,6 @@ public com.google.protobuf.TypeOrBuilder getTypesOrBuilder(int index) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4254,7 +4256,6 @@ public java.util.List<? extends com.google.protobuf.TypeOrBuilder> getTypesOrBui
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4273,7 +4274,6 @@ public com.google.protobuf.Type.Builder addTypesBuilder() {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4293,7 +4293,6 @@ public com.google.protobuf.Type.Builder addTypesBuilder(int index) {
      * included.  Messages which are not referenced but shall be included, such as
      * types used by the `google.protobuf.Any` type, should be listed here by
      * name by the configuration author. Example:
-     *
      *     types:
      *     - name: google.protobuf.Int32
      * </pre>
@@ -4344,7 +4343,6 @@ private void ensureEnumsIsMutable() {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4366,7 +4364,6 @@ public java.util.List<com.google.protobuf.Enum> getEnumsList() {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4388,7 +4385,6 @@ public int getEnumsCount() {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4410,7 +4406,6 @@ public com.google.protobuf.Enum getEnums(int index) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4438,7 +4433,6 @@ public Builder setEnums(int index, com.google.protobuf.Enum value) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4463,7 +4457,6 @@ public Builder setEnums(int index, com.google.protobuf.Enum.Builder builderForVa
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4491,7 +4484,6 @@ public Builder addEnums(com.google.protobuf.Enum value) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4519,7 +4511,6 @@ public Builder addEnums(int index, com.google.protobuf.Enum value) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4544,7 +4535,6 @@ public Builder addEnums(com.google.protobuf.Enum.Builder builderForValue) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4569,7 +4559,6 @@ public Builder addEnums(int index, com.google.protobuf.Enum.Builder builderForVa
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4594,7 +4583,6 @@ public Builder addAllEnums(java.lang.Iterable<? extends com.google.protobuf.Enum
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4619,7 +4607,6 @@ public Builder clearEnums() {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4644,7 +4631,6 @@ public Builder removeEnums(int index) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4662,7 +4648,6 @@ public com.google.protobuf.Enum.Builder getEnumsBuilder(int index) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4684,7 +4669,6 @@ public com.google.protobuf.EnumOrBuilder getEnumsOrBuilder(int index) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4706,7 +4690,6 @@ public java.util.List<? extends com.google.protobuf.EnumOrBuilder> getEnumsOrBui
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4724,7 +4707,6 @@ public com.google.protobuf.Enum.Builder addEnumsBuilder() {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -4743,7 +4725,6 @@ public com.google.protobuf.Enum.Builder addEnumsBuilder(int index) {
      * directly or indirectly by the `apis` are automatically included.  Enums
      * which are not referenced but shall be included should be listed here by
      * name by the configuration author. Example:
-     *
      *     enums:
      *     - name: google.someapi.v1.SomeEnum
      * </pre>
@@ -8737,7 +8718,6 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8754,7 +8734,6 @@ public boolean hasConfigVersion() {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8777,7 +8756,6 @@ public com.google.protobuf.UInt32Value getConfigVersion() {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8802,7 +8780,6 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value value) {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8824,7 +8801,6 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value.Builder builderF
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8852,7 +8828,6 @@ public Builder mergeConfigVersion(com.google.protobuf.UInt32Value value) {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8874,7 +8849,6 @@ public Builder clearConfigVersion() {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8891,7 +8865,6 @@ public com.google.protobuf.UInt32Value.Builder getConfigVersionBuilder() {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
@@ -8912,7 +8885,6 @@ public com.google.protobuf.UInt32ValueOrBuilder getConfigVersionOrBuilder() {
      *
      * <pre>
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java
index e390948dea..4bf479bf81 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java
@@ -217,7 +217,6 @@ public interface ServiceOrBuilder
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -234,7 +233,6 @@ public interface ServiceOrBuilder
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -251,7 +249,6 @@ public interface ServiceOrBuilder
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -268,7 +265,6 @@ public interface ServiceOrBuilder
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -285,7 +281,6 @@ public interface ServiceOrBuilder
    * included.  Messages which are not referenced but shall be included, such as
    * types used by the `google.protobuf.Any` type, should be listed here by
    * name by the configuration author. Example:
-   *
    *     types:
    *     - name: google.protobuf.Int32
    * </pre>
@@ -302,7 +297,6 @@ public interface ServiceOrBuilder
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -318,7 +312,6 @@ public interface ServiceOrBuilder
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -334,7 +327,6 @@ public interface ServiceOrBuilder
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -350,7 +342,6 @@ public interface ServiceOrBuilder
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -366,7 +357,6 @@ public interface ServiceOrBuilder
    * directly or indirectly by the `apis` are automatically included.  Enums
    * which are not referenced but shall be included should be listed here by
    * name by the configuration author. Example:
-   *
    *     enums:
    *     - name: google.someapi.v1.SomeEnum
    * </pre>
@@ -1101,7 +1091,6 @@ public interface ServiceOrBuilder
    *
    * <pre>
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * </pre>
@@ -1116,7 +1105,6 @@ public interface ServiceOrBuilder
    *
    * <pre>
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * </pre>
@@ -1131,7 +1119,6 @@ public interface ServiceOrBuilder
    *
    * <pre>
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
index e918cfa384..eb2384b6e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SourceInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_descriptor;
   }
@@ -380,6 +385,39 @@ private void buildPartial0(com.google.api.SourceInfo result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SourceInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
index 96701a9372..10cd4584bb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
@@ -51,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SystemParameter();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SystemParameterProto
         .internal_static_google_api_SystemParameter_descriptor;
@@ -486,6 +491,39 @@ private void buildPartial0(com.google.api.SystemParameter result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SystemParameter) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
index 03efa923cb..ffdca924be 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SystemParameterRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SystemParameterProto
         .internal_static_google_api_SystemParameterRule_descriptor;
@@ -74,7 +79,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -101,7 +105,6 @@ public java.lang.String getSelector() {
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -483,6 +486,39 @@ private void buildPartial0(com.google.api.SystemParameterRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SystemParameterRule) {
@@ -597,7 +633,6 @@ public Builder mergeFrom(
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -623,7 +658,6 @@ public java.lang.String getSelector() {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -649,7 +683,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -674,7 +707,6 @@ public Builder setSelector(java.lang.String value) {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -695,7 +727,6 @@ public Builder clearSelector() {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRuleOrBuilder.java
index c3145cdd04..da5cd58b1e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRuleOrBuilder.java
@@ -29,7 +29,6 @@ public interface SystemParameterRuleOrBuilder
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -45,7 +44,6 @@ public interface SystemParameterRuleOrBuilder
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
index 1a9d626e17..9d6e6d830b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
@@ -23,7 +23,6 @@
  *
  * <pre>
  * ### System parameter configuration
- *
  * A system parameter is a special kind of parameter defined by the API
  * system, not by an individual API. It is typically mapped to an HTTP header
  * and/or a URL query parameter. This configuration specifies which methods
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SystemParameters();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SystemParameterProto
         .internal_static_google_api_SystemParameters_descriptor;
@@ -75,24 +79,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -101,7 +99,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -116,24 +113,18 @@ public java.util.List<com.google.api.SystemParameterRule> getRulesList() {
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -142,7 +133,6 @@ public java.util.List<com.google.api.SystemParameterRule> getRulesList() {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -158,24 +148,18 @@ public java.util.List<com.google.api.SystemParameterRule> getRulesList() {
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -184,7 +168,6 @@ public java.util.List<com.google.api.SystemParameterRule> getRulesList() {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -199,24 +182,18 @@ public int getRulesCount() {
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -225,7 +202,6 @@ public int getRulesCount() {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -240,24 +216,18 @@ public com.google.api.SystemParameterRule getRules(int index) {
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -266,7 +236,6 @@ public com.google.api.SystemParameterRule getRules(int index) {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -441,7 +410,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * ### System parameter configuration
-   *
    * A system parameter is a special kind of parameter defined by the API
    * system, not by an individual API. It is typically mapped to an HTTP header
    * and/or a URL query parameter. This configuration specifies which methods
@@ -536,6 +504,39 @@ private void buildPartial0(com.google.api.SystemParameters result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.SystemParameters) {
@@ -654,24 +655,18 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -680,7 +675,6 @@ private void ensureRulesIsMutable() {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -698,24 +692,18 @@ public java.util.List<com.google.api.SystemParameterRule> getRulesList() {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -724,7 +712,6 @@ public java.util.List<com.google.api.SystemParameterRule> getRulesList() {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -742,24 +729,18 @@ public int getRulesCount() {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -768,7 +749,6 @@ public int getRulesCount() {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -786,24 +766,18 @@ public com.google.api.SystemParameterRule getRules(int index) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -812,7 +786,6 @@ public com.google.api.SystemParameterRule getRules(int index) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -836,24 +809,18 @@ public Builder setRules(int index, com.google.api.SystemParameterRule value) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -862,7 +829,6 @@ public Builder setRules(int index, com.google.api.SystemParameterRule value) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -883,24 +849,18 @@ public Builder setRules(int index, com.google.api.SystemParameterRule.Builder bu
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -909,7 +869,6 @@ public Builder setRules(int index, com.google.api.SystemParameterRule.Builder bu
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -933,24 +892,18 @@ public Builder addRules(com.google.api.SystemParameterRule value) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -959,7 +912,6 @@ public Builder addRules(com.google.api.SystemParameterRule value) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -983,24 +935,18 @@ public Builder addRules(int index, com.google.api.SystemParameterRule value) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1009,7 +955,6 @@ public Builder addRules(int index, com.google.api.SystemParameterRule value) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1030,24 +975,18 @@ public Builder addRules(com.google.api.SystemParameterRule.Builder builderForVal
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1056,7 +995,6 @@ public Builder addRules(com.google.api.SystemParameterRule.Builder builderForVal
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1077,24 +1015,18 @@ public Builder addRules(int index, com.google.api.SystemParameterRule.Builder bu
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1103,7 +1035,6 @@ public Builder addRules(int index, com.google.api.SystemParameterRule.Builder bu
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1125,24 +1056,18 @@ public Builder addAllRules(
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1151,7 +1076,6 @@ public Builder addAllRules(
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1172,24 +1096,18 @@ public Builder clearRules() {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1198,7 +1116,6 @@ public Builder clearRules() {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1219,24 +1136,18 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1245,7 +1156,6 @@ public Builder removeRules(int index) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1259,24 +1169,18 @@ public com.google.api.SystemParameterRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1285,7 +1189,6 @@ public com.google.api.SystemParameterRule.Builder getRulesBuilder(int index) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1303,24 +1206,18 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(int index)
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1329,7 +1226,6 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(int index)
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1348,24 +1244,18 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(int index)
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1374,7 +1264,6 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(int index)
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1389,24 +1278,18 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder() {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1415,7 +1298,6 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder() {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1430,24 +1312,18 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * Define system parameters.
-     *
      * The parameters defined here will override the default parameters
      * implemented by the system. If this field is missing from the service
      * config, default system parameters will be used. Default system parameters
      * and names is implementation-dependent.
-     *
      * Example: define api key for all methods
-     *
      *     system_parameters
      *       rules:
      *         - selector: "*"
      *           parameters:
      *             - name: api_key
      *               url_query_parameter: api_key
-     *
-     *
      * Example: define 2 api key names for a specific method.
-     *
      *     system_parameters
      *       rules:
      *         - selector: "/ListShelves"
@@ -1456,7 +1332,6 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder(int index) {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParametersOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParametersOrBuilder.java
index 3781566f93..a989804140 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParametersOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParametersOrBuilder.java
@@ -28,24 +28,18 @@ public interface SystemParametersOrBuilder
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -54,7 +48,6 @@ public interface SystemParametersOrBuilder
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -66,24 +59,18 @@ public interface SystemParametersOrBuilder
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -92,7 +79,6 @@ public interface SystemParametersOrBuilder
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -104,24 +90,18 @@ public interface SystemParametersOrBuilder
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -130,7 +110,6 @@ public interface SystemParametersOrBuilder
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -142,24 +121,18 @@ public interface SystemParametersOrBuilder
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -168,7 +141,6 @@ public interface SystemParametersOrBuilder
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -180,24 +152,18 @@ public interface SystemParametersOrBuilder
    *
    * <pre>
    * Define system parameters.
-   *
    * The parameters defined here will override the default parameters
    * implemented by the system. If this field is missing from the service
    * config, default system parameters will be used. Default system parameters
    * and names is implementation-dependent.
-   *
    * Example: define api key for all methods
-   *
    *     system_parameters
    *       rules:
    *         - selector: "*"
    *           parameters:
    *             - name: api_key
    *               url_query_parameter: api_key
-   *
-   *
    * Example: define 2 api key names for a specific method.
-   *
    *     system_parameters
    *       rules:
    *         - selector: "/ListShelves"
@@ -206,7 +172,6 @@ public interface SystemParametersOrBuilder
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Usage.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Usage.java
index e68991b95f..1fcbcf7751 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Usage.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Usage.java
@@ -38,7 +38,7 @@ private Usage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
   }
 
   private Usage() {
-    requirements_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    requirements_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     rules_ = java.util.Collections.emptyList();
     producerNotificationChannel_ = "";
   }
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Usage();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.UsageProto.internal_static_google_api_Usage_descriptor;
   }
@@ -64,8 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public static final int REQUIREMENTS_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList requirements_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList requirements_;
   /**
    *
    *
@@ -73,7 +77,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -95,7 +98,6 @@ public com.google.protobuf.ProtocolStringList getRequirementsList() {
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -117,7 +119,6 @@ public int getRequirementsCount() {
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -140,7 +141,6 @@ public java.lang.String getRequirements(int index) {
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -166,7 +166,6 @@ public com.google.protobuf.ByteString getRequirementsBytes(int index) {
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -181,7 +180,6 @@ public java.util.List<com.google.api.UsageRule> getRulesList() {
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -196,7 +194,6 @@ public java.util.List<? extends com.google.api.UsageRuleOrBuilder> getRulesOrBui
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -211,7 +208,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -226,7 +222,6 @@ public com.google.api.UsageRule getRules(int index) {
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -247,7 +242,6 @@ public com.google.api.UsageRuleOrBuilder getRulesOrBuilder(int index) {
    * <pre>
    * The full resource name of a channel used for sending notifications to the
    * service producer.
-   *
    * Google Service Management currently only supports
    * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
    * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -277,7 +271,6 @@ public java.lang.String getProducerNotificationChannel() {
    * <pre>
    * The full resource name of a channel used for sending notifications to the
    * service producer.
-   *
    * Google Service Management currently only supports
    * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
    * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -524,7 +517,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     public Builder clear() {
       super.clear();
       bitField0_ = 0;
-      requirements_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      requirements_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -567,6 +561,11 @@ public com.google.api.Usage buildPartial() {
     }
 
     private void buildPartialRepeatedFields(com.google.api.Usage result) {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        requirements_ = requirements_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.requirements_ = requirements_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -580,15 +579,44 @@ private void buildPartialRepeatedFields(com.google.api.Usage result) {
 
     private void buildPartial0(com.google.api.Usage result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        requirements_.makeImmutable();
-        result.requirements_ = requirements_;
-      }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.producerNotificationChannel_ = producerNotificationChannel_;
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Usage) {
@@ -604,7 +632,7 @@ public Builder mergeFrom(com.google.api.Usage other) {
       if (!other.requirements_.isEmpty()) {
         if (requirements_.isEmpty()) {
           requirements_ = other.requirements_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureRequirementsIsMutable();
           requirements_.addAll(other.requirements_);
@@ -713,14 +741,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList requirements_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList requirements_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRequirementsIsMutable() {
-      if (!requirements_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         requirements_ = new com.google.protobuf.LazyStringArrayList(requirements_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
     /**
      *
@@ -729,7 +757,6 @@ private void ensureRequirementsIsMutable() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -742,8 +769,7 @@ private void ensureRequirementsIsMutable() {
      * @return A list containing the requirements.
      */
     public com.google.protobuf.ProtocolStringList getRequirementsList() {
-      requirements_.makeImmutable();
-      return requirements_;
+      return requirements_.getUnmodifiableView();
     }
     /**
      *
@@ -752,7 +778,6 @@ public com.google.protobuf.ProtocolStringList getRequirementsList() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -774,7 +799,6 @@ public int getRequirementsCount() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -797,7 +821,6 @@ public java.lang.String getRequirements(int index) {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -820,7 +843,6 @@ public com.google.protobuf.ByteString getRequirementsBytes(int index) {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -840,7 +862,6 @@ public Builder setRequirements(int index, java.lang.String value) {
       }
       ensureRequirementsIsMutable();
       requirements_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -851,7 +872,6 @@ public Builder setRequirements(int index, java.lang.String value) {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -870,7 +890,6 @@ public Builder addRequirements(java.lang.String value) {
       }
       ensureRequirementsIsMutable();
       requirements_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -881,7 +900,6 @@ public Builder addRequirements(java.lang.String value) {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -897,7 +915,6 @@ public Builder addRequirements(java.lang.String value) {
     public Builder addAllRequirements(java.lang.Iterable<java.lang.String> values) {
       ensureRequirementsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, requirements_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -908,7 +925,6 @@ public Builder addAllRequirements(java.lang.Iterable<java.lang.String> values) {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -921,9 +937,8 @@ public Builder addAllRequirements(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearRequirements() {
-      requirements_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      requirements_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -934,7 +949,6 @@ public Builder clearRequirements() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
      * for example 'serviceusage.googleapis.com/billing-enabled'.
-     *
      * For Google APIs, a Terms of Service requirement must be included here.
      * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
      * Other Google APIs should include
@@ -954,7 +968,6 @@ public Builder addRequirementsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRequirementsIsMutable();
       requirements_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -979,7 +992,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -997,7 +1009,6 @@ public java.util.List<com.google.api.UsageRule> getRulesList() {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1015,7 +1026,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1033,7 +1043,6 @@ public com.google.api.UsageRule getRules(int index) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1057,7 +1066,6 @@ public Builder setRules(int index, com.google.api.UsageRule value) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1078,7 +1086,6 @@ public Builder setRules(int index, com.google.api.UsageRule.Builder builderForVa
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1102,7 +1109,6 @@ public Builder addRules(com.google.api.UsageRule value) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1126,7 +1132,6 @@ public Builder addRules(int index, com.google.api.UsageRule value) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1147,7 +1152,6 @@ public Builder addRules(com.google.api.UsageRule.Builder builderForValue) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1168,7 +1172,6 @@ public Builder addRules(int index, com.google.api.UsageRule.Builder builderForVa
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1189,7 +1192,6 @@ public Builder addAllRules(java.lang.Iterable<? extends com.google.api.UsageRule
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1210,7 +1212,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1231,7 +1232,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1245,7 +1245,6 @@ public com.google.api.UsageRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1263,7 +1262,6 @@ public com.google.api.UsageRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1281,7 +1279,6 @@ public java.util.List<? extends com.google.api.UsageRuleOrBuilder> getRulesOrBui
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1295,7 +1292,6 @@ public com.google.api.UsageRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1310,7 +1306,6 @@ public com.google.api.UsageRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -1344,7 +1339,6 @@ public java.util.List<com.google.api.UsageRule.Builder> getRulesBuilderList() {
      * <pre>
      * The full resource name of a channel used for sending notifications to the
      * service producer.
-     *
      * Google Service Management currently only supports
      * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
      * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -1373,7 +1367,6 @@ public java.lang.String getProducerNotificationChannel() {
      * <pre>
      * The full resource name of a channel used for sending notifications to the
      * service producer.
-     *
      * Google Service Management currently only supports
      * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
      * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -1402,7 +1395,6 @@ public com.google.protobuf.ByteString getProducerNotificationChannelBytes() {
      * <pre>
      * The full resource name of a channel used for sending notifications to the
      * service producer.
-     *
      * Google Service Management currently only supports
      * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
      * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -1430,7 +1422,6 @@ public Builder setProducerNotificationChannel(java.lang.String value) {
      * <pre>
      * The full resource name of a channel used for sending notifications to the
      * service producer.
-     *
      * Google Service Management currently only supports
      * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
      * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -1454,7 +1445,6 @@ public Builder clearProducerNotificationChannel() {
      * <pre>
      * The full resource name of a channel used for sending notifications to the
      * service producer.
-     *
      * Google Service Management currently only supports
      * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
      * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageOrBuilder.java
index d653c034c2..ff0c52dd41 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageOrBuilder.java
@@ -30,7 +30,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -50,7 +49,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -70,7 +68,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -91,7 +88,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form &lt;service.name&gt;/&lt;requirement-id&gt;;
    * for example 'serviceusage.googleapis.com/billing-enabled'.
-   *
    * For Google APIs, a Terms of Service requirement must be included here.
    * Google Cloud APIs must include "serviceusage.googleapis.com/tos/cloud".
    * Other Google APIs should include
@@ -111,7 +107,6 @@ public interface UsageOrBuilder
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -123,7 +118,6 @@ public interface UsageOrBuilder
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -135,7 +129,6 @@ public interface UsageOrBuilder
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -147,7 +140,6 @@ public interface UsageOrBuilder
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -159,7 +151,6 @@ public interface UsageOrBuilder
    *
    * <pre>
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -173,7 +164,6 @@ public interface UsageOrBuilder
    * <pre>
    * The full resource name of a channel used for sending notifications to the
    * service producer.
-   *
    * Google Service Management currently only supports
    * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
    * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
@@ -192,7 +182,6 @@ public interface UsageOrBuilder
    * <pre>
    * The full resource name of a channel used for sending notifications to the
    * service producer.
-   *
    * Google Service Management currently only supports
    * [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification
    * channel. To use Google Cloud Pub/Sub as the channel, this must be the name
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
index 0b5159bde1..8cd6f28d51 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
@@ -23,26 +23,19 @@
  *
  * <pre>
  * Usage configuration rules for the service.
- *
  * NOTE: Under development.
- *
- *
  * Use this rule to configure unregistered calls for the service. Unregistered
  * calls are calls that do not contain consumer project identity.
  * (Example: calls that do not contain an API key).
  * By default, API methods do not allow unregistered calls, and each method call
  * must be identified by a consumer project identity. Use this rule to
  * allow/disallow unregistered calls.
- *
  * Example of an API that wants to allow unregistered calls for entire service.
- *
  *     usage:
  *       rules:
  *       - selector: "*"
  *         allow_unregistered_calls: true
- *
  * Example of a method that wants to allow unregistered calls.
- *
  *     usage:
  *       rules:
  *       - selector: "google.example.library.v1.LibraryService.CreateBook"
@@ -71,6 +64,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UsageRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.UsageProto.internal_static_google_api_UsageRule_descriptor;
   }
@@ -93,7 +91,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -120,7 +117,6 @@ public java.lang.String getSelector() {
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -362,26 +358,19 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Usage configuration rules for the service.
-   *
    * NOTE: Under development.
-   *
-   *
    * Use this rule to configure unregistered calls for the service. Unregistered
    * calls are calls that do not contain consumer project identity.
    * (Example: calls that do not contain an API key).
    * By default, API methods do not allow unregistered calls, and each method call
    * must be identified by a consumer project identity. Use this rule to
    * allow/disallow unregistered calls.
-   *
    * Example of an API that wants to allow unregistered calls for entire service.
-   *
    *     usage:
    *       rules:
    *       - selector: "*"
    *         allow_unregistered_calls: true
-   *
    * Example of a method that wants to allow unregistered calls.
-   *
    *     usage:
    *       rules:
    *       - selector: "google.example.library.v1.LibraryService.CreateBook"
@@ -465,6 +454,39 @@ private void buildPartial0(com.google.api.UsageRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.UsageRule) {
@@ -558,7 +580,6 @@ public Builder mergeFrom(
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -584,7 +605,6 @@ public java.lang.String getSelector() {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -610,7 +630,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -635,7 +654,6 @@ public Builder setSelector(java.lang.String value) {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -656,7 +674,6 @@ public Builder clearSelector() {
      * <pre>
      * Selects the methods to which this rule applies. Use '*' to indicate all
      * methods in all APIs.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRuleOrBuilder.java
index 77caf516d2..c283341880 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRuleOrBuilder.java
@@ -29,7 +29,6 @@ public interface UsageRuleOrBuilder
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -45,7 +44,6 @@ public interface UsageRuleOrBuilder
    * <pre>
    * Selects the methods to which this rule applies. Use '*' to indicate all
    * methods in all APIs.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java
index 3c7e0137f8..e74061dbf2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java
@@ -26,23 +26,18 @@
  * such as whether an application can call a visibility-restricted method.
  * The restriction is expressed by applying visibility labels on service
  * elements. The visibility labels are elsewhere linked to service consumers.
- *
  * A service can define multiple visibility labels, but a service consumer
  * should be granted at most one visibility label. Multiple visibility
  * labels for a single service consumer are not supported.
- *
  * If an element and all its parents have no visibility label, its visibility
  * is unconditionally granted.
- *
  * Example:
- *
  *     visibility:
  *       rules:
  *       - selector: google.calendar.Calendar.EnhancedSearch
  *         restriction: PREVIEW
  *       - selector: google.calendar.Calendar.Delegate
  *         restriction: INTERNAL
- *
  * Here, all methods are publicly visible except for the restricted methods
  * EnhancedSearch and Delegate.
  * </pre>
@@ -69,6 +64,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Visibility();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.VisibilityProto.internal_static_google_api_Visibility_descriptor;
   }
@@ -90,7 +90,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -105,7 +104,6 @@ public java.util.List<com.google.api.VisibilityRule> getRulesList() {
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -120,7 +118,6 @@ public java.util.List<? extends com.google.api.VisibilityRuleOrBuilder> getRules
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -135,7 +132,6 @@ public int getRulesCount() {
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -150,7 +146,6 @@ public com.google.api.VisibilityRule getRules(int index) {
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -328,23 +323,18 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * such as whether an application can call a visibility-restricted method.
    * The restriction is expressed by applying visibility labels on service
    * elements. The visibility labels are elsewhere linked to service consumers.
-   *
    * A service can define multiple visibility labels, but a service consumer
    * should be granted at most one visibility label. Multiple visibility
    * labels for a single service consumer are not supported.
-   *
    * If an element and all its parents have no visibility label, its visibility
    * is unconditionally granted.
-   *
    * Example:
-   *
    *     visibility:
    *       rules:
    *       - selector: google.calendar.Calendar.EnhancedSearch
    *         restriction: PREVIEW
    *       - selector: google.calendar.Calendar.Delegate
    *         restriction: INTERNAL
-   *
    * Here, all methods are publicly visible except for the restricted methods
    * EnhancedSearch and Delegate.
    * </pre>
@@ -434,6 +424,39 @@ private void buildPartial0(com.google.api.Visibility result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Visibility) {
@@ -551,7 +574,6 @@ private void ensureRulesIsMutable() {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -569,7 +591,6 @@ public java.util.List<com.google.api.VisibilityRule> getRulesList() {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -587,7 +608,6 @@ public int getRulesCount() {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -605,7 +625,6 @@ public com.google.api.VisibilityRule getRules(int index) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -629,7 +648,6 @@ public Builder setRules(int index, com.google.api.VisibilityRule value) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -650,7 +668,6 @@ public Builder setRules(int index, com.google.api.VisibilityRule.Builder builder
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -674,7 +691,6 @@ public Builder addRules(com.google.api.VisibilityRule value) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -698,7 +714,6 @@ public Builder addRules(int index, com.google.api.VisibilityRule value) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -719,7 +734,6 @@ public Builder addRules(com.google.api.VisibilityRule.Builder builderForValue) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -740,7 +754,6 @@ public Builder addRules(int index, com.google.api.VisibilityRule.Builder builder
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -761,7 +774,6 @@ public Builder addAllRules(java.lang.Iterable<? extends com.google.api.Visibilit
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -782,7 +794,6 @@ public Builder clearRules() {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -803,7 +814,6 @@ public Builder removeRules(int index) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -817,7 +827,6 @@ public com.google.api.VisibilityRule.Builder getRulesBuilder(int index) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -835,7 +844,6 @@ public com.google.api.VisibilityRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -854,7 +862,6 @@ public com.google.api.VisibilityRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -868,7 +875,6 @@ public com.google.api.VisibilityRule.Builder addRulesBuilder() {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
@@ -883,7 +889,6 @@ public com.google.api.VisibilityRule.Builder addRulesBuilder(int index) {
      *
      * <pre>
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityOrBuilder.java
index 658f91e87d..40544aa4bb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityOrBuilder.java
@@ -28,7 +28,6 @@ public interface VisibilityOrBuilder
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -40,7 +39,6 @@ public interface VisibilityOrBuilder
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -52,7 +50,6 @@ public interface VisibilityOrBuilder
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -64,7 +61,6 @@ public interface VisibilityOrBuilder
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
@@ -76,7 +72,6 @@ public interface VisibilityOrBuilder
    *
    * <pre>
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java
index 9b21ecb972..e86d808534 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new VisibilityRule();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.VisibilityProto.internal_static_google_api_VisibilityRule_descriptor;
   }
@@ -71,7 +76,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -97,7 +101,6 @@ public java.lang.String getSelector() {
    *
    * <pre>
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -129,17 +132,13 @@ public com.google.protobuf.ByteString getSelectorBytes() {
    * <pre>
    * A comma-separated list of visibility labels that apply to the `selector`.
    * Any of the listed labels can be used to grant the visibility.
-   *
    * If a rule has multiple labels, removing one of the labels but not all of
    * them can break clients.
-   *
    * Example:
-   *
    *     visibility:
    *       rules:
    *       - selector: google.calendar.Calendar.EnhancedSearch
    *         restriction: INTERNAL, PREVIEW
-   *
    * Removing INTERNAL from this restriction will break clients that rely on
    * this method and only had access to it through INTERNAL.
    * </pre>
@@ -166,17 +165,13 @@ public java.lang.String getRestriction() {
    * <pre>
    * A comma-separated list of visibility labels that apply to the `selector`.
    * Any of the listed labels can be used to grant the visibility.
-   *
    * If a rule has multiple labels, removing one of the labels but not all of
    * them can break clients.
-   *
    * Example:
-   *
    *     visibility:
    *       rules:
    *       - selector: google.calendar.Calendar.EnhancedSearch
    *         restriction: INTERNAL, PREVIEW
-   *
    * Removing INTERNAL from this restriction will break clients that rely on
    * this method and only had access to it through INTERNAL.
    * </pre>
@@ -446,6 +441,39 @@ private void buildPartial0(com.google.api.VisibilityRule result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.VisibilityRule) {
@@ -531,7 +559,6 @@ public Builder mergeFrom(
      *
      * <pre>
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -556,7 +583,6 @@ public java.lang.String getSelector() {
      *
      * <pre>
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -581,7 +607,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * <pre>
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -605,7 +630,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * <pre>
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -625,7 +649,6 @@ public Builder clearSelector() {
      *
      * <pre>
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * </pre>
@@ -653,17 +676,13 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * <pre>
      * A comma-separated list of visibility labels that apply to the `selector`.
      * Any of the listed labels can be used to grant the visibility.
-     *
      * If a rule has multiple labels, removing one of the labels but not all of
      * them can break clients.
-     *
      * Example:
-     *
      *     visibility:
      *       rules:
      *       - selector: google.calendar.Calendar.EnhancedSearch
      *         restriction: INTERNAL, PREVIEW
-     *
      * Removing INTERNAL from this restriction will break clients that rely on
      * this method and only had access to it through INTERNAL.
      * </pre>
@@ -689,17 +708,13 @@ public java.lang.String getRestriction() {
      * <pre>
      * A comma-separated list of visibility labels that apply to the `selector`.
      * Any of the listed labels can be used to grant the visibility.
-     *
      * If a rule has multiple labels, removing one of the labels but not all of
      * them can break clients.
-     *
      * Example:
-     *
      *     visibility:
      *       rules:
      *       - selector: google.calendar.Calendar.EnhancedSearch
      *         restriction: INTERNAL, PREVIEW
-     *
      * Removing INTERNAL from this restriction will break clients that rely on
      * this method and only had access to it through INTERNAL.
      * </pre>
@@ -725,17 +740,13 @@ public com.google.protobuf.ByteString getRestrictionBytes() {
      * <pre>
      * A comma-separated list of visibility labels that apply to the `selector`.
      * Any of the listed labels can be used to grant the visibility.
-     *
      * If a rule has multiple labels, removing one of the labels but not all of
      * them can break clients.
-     *
      * Example:
-     *
      *     visibility:
      *       rules:
      *       - selector: google.calendar.Calendar.EnhancedSearch
      *         restriction: INTERNAL, PREVIEW
-     *
      * Removing INTERNAL from this restriction will break clients that rely on
      * this method and only had access to it through INTERNAL.
      * </pre>
@@ -760,17 +771,13 @@ public Builder setRestriction(java.lang.String value) {
      * <pre>
      * A comma-separated list of visibility labels that apply to the `selector`.
      * Any of the listed labels can be used to grant the visibility.
-     *
      * If a rule has multiple labels, removing one of the labels but not all of
      * them can break clients.
-     *
      * Example:
-     *
      *     visibility:
      *       rules:
      *       - selector: google.calendar.Calendar.EnhancedSearch
      *         restriction: INTERNAL, PREVIEW
-     *
      * Removing INTERNAL from this restriction will break clients that rely on
      * this method and only had access to it through INTERNAL.
      * </pre>
@@ -791,17 +798,13 @@ public Builder clearRestriction() {
      * <pre>
      * A comma-separated list of visibility labels that apply to the `selector`.
      * Any of the listed labels can be used to grant the visibility.
-     *
      * If a rule has multiple labels, removing one of the labels but not all of
      * them can break clients.
-     *
      * Example:
-     *
      *     visibility:
      *       rules:
      *       - selector: google.calendar.Calendar.EnhancedSearch
      *         restriction: INTERNAL, PREVIEW
-     *
      * Removing INTERNAL from this restriction will break clients that rely on
      * this method and only had access to it through INTERNAL.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRuleOrBuilder.java
index 575ab96a82..8321e03e4f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRuleOrBuilder.java
@@ -28,7 +28,6 @@ public interface VisibilityRuleOrBuilder
    *
    * <pre>
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -43,7 +42,6 @@ public interface VisibilityRuleOrBuilder
    *
    * <pre>
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * </pre>
@@ -60,17 +58,13 @@ public interface VisibilityRuleOrBuilder
    * <pre>
    * A comma-separated list of visibility labels that apply to the `selector`.
    * Any of the listed labels can be used to grant the visibility.
-   *
    * If a rule has multiple labels, removing one of the labels but not all of
    * them can break clients.
-   *
    * Example:
-   *
    *     visibility:
    *       rules:
    *       - selector: google.calendar.Calendar.EnhancedSearch
    *         restriction: INTERNAL, PREVIEW
-   *
    * Removing INTERNAL from this restriction will break clients that rely on
    * this method and only had access to it through INTERNAL.
    * </pre>
@@ -86,17 +80,13 @@ public interface VisibilityRuleOrBuilder
    * <pre>
    * A comma-separated list of visibility labels that apply to the `selector`.
    * Any of the listed labels can be used to grant the visibility.
-   *
    * If a rule has multiple labels, removing one of the labels but not all of
    * them can break clients.
-   *
    * Example:
-   *
    *     visibility:
    *       rules:
    *       - selector: google.calendar.Calendar.EnhancedSearch
    *         restriction: INTERNAL, PREVIEW
-   *
    * Removing INTERNAL from this restriction will break clients that rely on
    * this method and only had access to it through INTERNAL.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java
index ecdf91f612..32b9812d7b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuditLog();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_AuditLog_descriptor;
@@ -128,7 +133,6 @@ public com.google.protobuf.ByteString getServiceNameBytes() {
    * The name of the service method or operation.
    * For API calls, this should be the name of the API method.
    * For example,
-   *
    *     "google.cloud.bigquery.v2.TableService.InsertTable"
    *     "google.logging.v2.ConfigServiceV2.CreateSink"
    * </pre>
@@ -156,7 +160,6 @@ public java.lang.String getMethodName() {
    * The name of the service method or operation.
    * For API calls, this should be the name of the API method.
    * For example,
-   *
    *     "google.cloud.bigquery.v2.TableService.InsertTable"
    *     "google.logging.v2.ConfigServiceV2.CreateSink"
    * </pre>
@@ -189,7 +192,6 @@ public com.google.protobuf.ByteString getMethodNameBytes() {
    * The resource or collection that is the target of the operation.
    * The name is a scheme-less URI, not including the API service name.
    * For example:
-   *
    *     "projects/PROJECT_ID/zones/us-central1-a/instances"
    *     "projects/PROJECT_ID/datasets/DATASET_ID"
    * </pre>
@@ -217,7 +219,6 @@ public java.lang.String getResourceName() {
    * The resource or collection that is the target of the operation.
    * The name is a scheme-less URI, not including the API service name.
    * For example:
-   *
    *     "projects/PROJECT_ID/zones/us-central1-a/instances"
    *     "projects/PROJECT_ID/datasets/DATASET_ID"
    * </pre>
@@ -1431,6 +1432,39 @@ private void buildPartial0(com.google.cloud.audit.AuditLog result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.AuditLog) {
@@ -1783,7 +1817,6 @@ public Builder setServiceNameBytes(com.google.protobuf.ByteString value) {
      * The name of the service method or operation.
      * For API calls, this should be the name of the API method.
      * For example,
-     *
      *     "google.cloud.bigquery.v2.TableService.InsertTable"
      *     "google.logging.v2.ConfigServiceV2.CreateSink"
      * </pre>
@@ -1810,7 +1843,6 @@ public java.lang.String getMethodName() {
      * The name of the service method or operation.
      * For API calls, this should be the name of the API method.
      * For example,
-     *
      *     "google.cloud.bigquery.v2.TableService.InsertTable"
      *     "google.logging.v2.ConfigServiceV2.CreateSink"
      * </pre>
@@ -1837,7 +1869,6 @@ public com.google.protobuf.ByteString getMethodNameBytes() {
      * The name of the service method or operation.
      * For API calls, this should be the name of the API method.
      * For example,
-     *
      *     "google.cloud.bigquery.v2.TableService.InsertTable"
      *     "google.logging.v2.ConfigServiceV2.CreateSink"
      * </pre>
@@ -1863,7 +1894,6 @@ public Builder setMethodName(java.lang.String value) {
      * The name of the service method or operation.
      * For API calls, this should be the name of the API method.
      * For example,
-     *
      *     "google.cloud.bigquery.v2.TableService.InsertTable"
      *     "google.logging.v2.ConfigServiceV2.CreateSink"
      * </pre>
@@ -1885,7 +1915,6 @@ public Builder clearMethodName() {
      * The name of the service method or operation.
      * For API calls, this should be the name of the API method.
      * For example,
-     *
      *     "google.cloud.bigquery.v2.TableService.InsertTable"
      *     "google.logging.v2.ConfigServiceV2.CreateSink"
      * </pre>
@@ -1914,7 +1943,6 @@ public Builder setMethodNameBytes(com.google.protobuf.ByteString value) {
      * The resource or collection that is the target of the operation.
      * The name is a scheme-less URI, not including the API service name.
      * For example:
-     *
      *     "projects/PROJECT_ID/zones/us-central1-a/instances"
      *     "projects/PROJECT_ID/datasets/DATASET_ID"
      * </pre>
@@ -1941,7 +1969,6 @@ public java.lang.String getResourceName() {
      * The resource or collection that is the target of the operation.
      * The name is a scheme-less URI, not including the API service name.
      * For example:
-     *
      *     "projects/PROJECT_ID/zones/us-central1-a/instances"
      *     "projects/PROJECT_ID/datasets/DATASET_ID"
      * </pre>
@@ -1968,7 +1995,6 @@ public com.google.protobuf.ByteString getResourceNameBytes() {
      * The resource or collection that is the target of the operation.
      * The name is a scheme-less URI, not including the API service name.
      * For example:
-     *
      *     "projects/PROJECT_ID/zones/us-central1-a/instances"
      *     "projects/PROJECT_ID/datasets/DATASET_ID"
      * </pre>
@@ -1994,7 +2020,6 @@ public Builder setResourceName(java.lang.String value) {
      * The resource or collection that is the target of the operation.
      * The name is a scheme-less URI, not including the API service name.
      * For example:
-     *
      *     "projects/PROJECT_ID/zones/us-central1-a/instances"
      *     "projects/PROJECT_ID/datasets/DATASET_ID"
      * </pre>
@@ -2016,7 +2041,6 @@ public Builder clearResourceName() {
      * The resource or collection that is the target of the operation.
      * The name is a scheme-less URI, not including the API service name.
      * For example:
-     *
      *     "projects/PROJECT_ID/zones/us-central1-a/instances"
      *     "projects/PROJECT_ID/datasets/DATASET_ID"
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java
index 0c1f8bc18e..6577487192 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java
@@ -57,7 +57,6 @@ public interface AuditLogOrBuilder
    * The name of the service method or operation.
    * For API calls, this should be the name of the API method.
    * For example,
-   *
    *     "google.cloud.bigquery.v2.TableService.InsertTable"
    *     "google.logging.v2.ConfigServiceV2.CreateSink"
    * </pre>
@@ -74,7 +73,6 @@ public interface AuditLogOrBuilder
    * The name of the service method or operation.
    * For API calls, this should be the name of the API method.
    * For example,
-   *
    *     "google.cloud.bigquery.v2.TableService.InsertTable"
    *     "google.logging.v2.ConfigServiceV2.CreateSink"
    * </pre>
@@ -92,7 +90,6 @@ public interface AuditLogOrBuilder
    * The resource or collection that is the target of the operation.
    * The name is a scheme-less URI, not including the API service name.
    * For example:
-   *
    *     "projects/PROJECT_ID/zones/us-central1-a/instances"
    *     "projects/PROJECT_ID/datasets/DATASET_ID"
    * </pre>
@@ -109,7 +106,6 @@ public interface AuditLogOrBuilder
    * The resource or collection that is the target of the operation.
    * The name is a scheme-less URI, not including the API service name.
    * For example:
-   *
    *     "projects/PROJECT_ID/zones/us-central1-a/instances"
    *     "projects/PROJECT_ID/datasets/DATASET_ID"
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogProto.java
index 40add613b7..2269b3f77e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogProto.java
@@ -140,24 +140,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "uf.StructB\013\n\tAuthority\"d\n\023PolicyViolatio"
           + "nInfo\022M\n\031org_policy_violation_info\030\001 \001(\013"
           + "2*.google.cloud.audit.OrgPolicyViolation"
-          + "Info\"\266\002\n\026OrgPolicyViolationInfo\022.\n\007paylo"
-          + "ad\030\001 \001(\0132\027.google.protobuf.StructB\004\342A\001\001\022"
-          + "\033\n\rresource_type\030\002 \001(\tB\004\342A\001\001\022Y\n\rresource"
-          + "_tags\030\003 \003(\0132<.google.cloud.audit.OrgPoli"
-          + "cyViolationInfo.ResourceTagsEntryB\004\342A\001\001\022"
-          + "?\n\016violation_info\030\004 \003(\0132!.google.cloud.a"
-          + "udit.ViolationInfoB\004\342A\001\001\0323\n\021ResourceTags"
-          + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\233\002"
-          + "\n\rViolationInfo\022\030\n\nconstraint\030\001 \001(\tB\004\342A\001"
-          + "\001\022\033\n\rerror_message\030\002 \001(\tB\004\342A\001\001\022\033\n\rchecke"
-          + "d_value\030\003 \001(\tB\004\342A\001\001\022G\n\013policy_type\030\004 \001(\016"
-          + "2,.google.cloud.audit.ViolationInfo.Poli"
-          + "cyTypeB\004\342A\001\001\"m\n\nPolicyType\022\033\n\027POLICY_TYP"
-          + "E_UNSPECIFIED\020\000\022\026\n\022BOOLEAN_CONSTRAINT\020\001\022"
-          + "\023\n\017LIST_CONSTRAINT\020\002\022\025\n\021CUSTOM_CONSTRAIN"
-          + "T\020\003Be\n\026com.google.cloud.auditB\rAuditLogP"
-          + "rotoP\001Z7google.golang.org/genproto/googl"
-          + "eapis/cloud/audit;audit\370\001\001b\006proto3"
+          + "Info\"\262\002\n\026OrgPolicyViolationInfo\022-\n\007paylo"
+          + "ad\030\001 \001(\0132\027.google.protobuf.StructB\003\340A\001\022\032"
+          + "\n\rresource_type\030\002 \001(\tB\003\340A\001\022X\n\rresource_t"
+          + "ags\030\003 \003(\0132<.google.cloud.audit.OrgPolicy"
+          + "ViolationInfo.ResourceTagsEntryB\003\340A\001\022>\n\016"
+          + "violation_info\030\004 \003(\0132!.google.cloud.audi"
+          + "t.ViolationInfoB\003\340A\001\0323\n\021ResourceTagsEntr"
+          + "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\227\002\n\rVi"
+          + "olationInfo\022\027\n\nconstraint\030\001 \001(\tB\003\340A\001\022\032\n\r"
+          + "error_message\030\002 \001(\tB\003\340A\001\022\032\n\rchecked_valu"
+          + "e\030\003 \001(\tB\003\340A\001\022F\n\013policy_type\030\004 \001(\0162,.goog"
+          + "le.cloud.audit.ViolationInfo.PolicyTypeB"
+          + "\003\340A\001\"m\n\nPolicyType\022\033\n\027POLICY_TYPE_UNSPEC"
+          + "IFIED\020\000\022\026\n\022BOOLEAN_CONSTRAINT\020\001\022\023\n\017LIST_"
+          + "CONSTRAINT\020\002\022\025\n\021CUSTOM_CONSTRAINT\020\003Be\n\026c"
+          + "om.google.cloud.auditB\rAuditLogProtoP\001Z7"
+          + "google.golang.org/genproto/googleapis/cl"
+          + "oud/audit;audit\370\001\001b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java
index c7d6932fbe..01d8e1e744 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java
@@ -51,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuthenticationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_AuthenticationInfo_descriptor;
@@ -250,7 +255,6 @@ public com.google.protobuf.StructOrBuilder getThirdPartyPrincipalOrBuilder() {
    * The name of the service account key used to create or exchange
    * credentials for authenticating the service account making the request.
    * This is a scheme-less URI full resource name. For example:
-   *
    * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
    * </pre>
    *
@@ -277,7 +281,6 @@ public java.lang.String getServiceAccountKeyName() {
    * The name of the service account key used to create or exchange
    * credentials for authenticating the service account making the request.
    * This is a scheme-less URI full resource name. For example:
-   *
    * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
    * </pre>
    *
@@ -795,6 +798,39 @@ private void buildPartial0(com.google.cloud.audit.AuthenticationInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.AuthenticationInfo) {
@@ -1408,7 +1444,6 @@ public com.google.protobuf.StructOrBuilder getThirdPartyPrincipalOrBuilder() {
      * The name of the service account key used to create or exchange
      * credentials for authenticating the service account making the request.
      * This is a scheme-less URI full resource name. For example:
-     *
      * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
      * </pre>
      *
@@ -1434,7 +1469,6 @@ public java.lang.String getServiceAccountKeyName() {
      * The name of the service account key used to create or exchange
      * credentials for authenticating the service account making the request.
      * This is a scheme-less URI full resource name. For example:
-     *
      * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
      * </pre>
      *
@@ -1460,7 +1494,6 @@ public com.google.protobuf.ByteString getServiceAccountKeyNameBytes() {
      * The name of the service account key used to create or exchange
      * credentials for authenticating the service account making the request.
      * This is a scheme-less URI full resource name. For example:
-     *
      * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
      * </pre>
      *
@@ -1485,7 +1518,6 @@ public Builder setServiceAccountKeyName(java.lang.String value) {
      * The name of the service account key used to create or exchange
      * credentials for authenticating the service account making the request.
      * This is a scheme-less URI full resource name. For example:
-     *
      * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
      * </pre>
      *
@@ -1506,7 +1538,6 @@ public Builder clearServiceAccountKeyName() {
      * The name of the service account key used to create or exchange
      * credentials for authenticating the service account making the request.
      * This is a scheme-less URI full resource name. For example:
-     *
      * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfoOrBuilder.java
index 1ae5ab45d5..2dfe54d9ea 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfoOrBuilder.java
@@ -136,7 +136,6 @@ public interface AuthenticationInfoOrBuilder
    * The name of the service account key used to create or exchange
    * credentials for authenticating the service account making the request.
    * This is a scheme-less URI full resource name. For example:
-   *
    * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
    * </pre>
    *
@@ -152,7 +151,6 @@ public interface AuthenticationInfoOrBuilder
    * The name of the service account key used to create or exchange
    * credentials for authenticating the service account making the request.
    * This is a scheme-less URI full resource name. For example:
-   *
    * "//iam.googleapis.com/projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}/keys/{key}"
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java
index 50cb43b5ab..faccc6595e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuthorizationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_AuthorizationInfo_descriptor;
@@ -73,7 +78,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * The resource being accessed, as a REST-style or cloud resource string.
    * For example:
-   *
    *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
    * or
    *     projects/PROJECTID/datasets/DATASETID
@@ -101,7 +105,6 @@ public java.lang.String getResource() {
    * <pre>
    * The resource being accessed, as a REST-style or cloud resource string.
    * For example:
-   *
    *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
    * or
    *     projects/PROJECTID/datasets/DATASETID
@@ -202,7 +205,6 @@ public boolean getGranted() {
    * <pre>
    * Resource attributes used in IAM condition evaluation. This field contains
    * resource attributes like resource type and resource name.
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.request_metadata.request_attributes`.
@@ -222,7 +224,6 @@ public boolean hasResourceAttributes() {
    * <pre>
    * Resource attributes used in IAM condition evaluation. This field contains
    * resource attributes like resource type and resource name.
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.request_metadata.request_attributes`.
@@ -244,7 +245,6 @@ public com.google.rpc.context.AttributeContext.Resource getResourceAttributes()
    * <pre>
    * Resource attributes used in IAM condition evaluation. This field contains
    * resource attributes like resource type and resource name.
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.request_metadata.request_attributes`.
@@ -550,6 +550,39 @@ private void buildPartial0(com.google.cloud.audit.AuthorizationInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.AuthorizationInfo) {
@@ -655,7 +688,6 @@ public Builder mergeFrom(
      * <pre>
      * The resource being accessed, as a REST-style or cloud resource string.
      * For example:
-     *
      *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
      * or
      *     projects/PROJECTID/datasets/DATASETID
@@ -682,7 +714,6 @@ public java.lang.String getResource() {
      * <pre>
      * The resource being accessed, as a REST-style or cloud resource string.
      * For example:
-     *
      *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
      * or
      *     projects/PROJECTID/datasets/DATASETID
@@ -709,7 +740,6 @@ public com.google.protobuf.ByteString getResourceBytes() {
      * <pre>
      * The resource being accessed, as a REST-style or cloud resource string.
      * For example:
-     *
      *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
      * or
      *     projects/PROJECTID/datasets/DATASETID
@@ -735,7 +765,6 @@ public Builder setResource(java.lang.String value) {
      * <pre>
      * The resource being accessed, as a REST-style or cloud resource string.
      * For example:
-     *
      *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
      * or
      *     projects/PROJECTID/datasets/DATASETID
@@ -757,7 +786,6 @@ public Builder clearResource() {
      * <pre>
      * The resource being accessed, as a REST-style or cloud resource string.
      * For example:
-     *
      *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
      * or
      *     projects/PROJECTID/datasets/DATASETID
@@ -953,7 +981,6 @@ public Builder clearGranted() {
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -972,7 +999,6 @@ public boolean hasResourceAttributes() {
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -997,7 +1023,6 @@ public com.google.rpc.context.AttributeContext.Resource getResourceAttributes()
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -1024,7 +1049,6 @@ public Builder setResourceAttributes(com.google.rpc.context.AttributeContext.Res
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -1049,7 +1073,6 @@ public Builder setResourceAttributes(
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -1080,7 +1103,6 @@ public Builder mergeResourceAttributes(com.google.rpc.context.AttributeContext.R
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -1104,7 +1126,6 @@ public Builder clearResourceAttributes() {
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -1123,7 +1144,6 @@ public com.google.rpc.context.AttributeContext.Resource.Builder getResourceAttri
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
@@ -1147,7 +1167,6 @@ public com.google.rpc.context.AttributeContext.Resource.Builder getResourceAttri
      * <pre>
      * Resource attributes used in IAM condition evaluation. This field contains
      * resource attributes like resource type and resource name.
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.request_metadata.request_attributes`.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfoOrBuilder.java
index d07958d948..fe0764ec63 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfoOrBuilder.java
@@ -29,7 +29,6 @@ public interface AuthorizationInfoOrBuilder
    * <pre>
    * The resource being accessed, as a REST-style or cloud resource string.
    * For example:
-   *
    *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
    * or
    *     projects/PROJECTID/datasets/DATASETID
@@ -46,7 +45,6 @@ public interface AuthorizationInfoOrBuilder
    * <pre>
    * The resource being accessed, as a REST-style or cloud resource string.
    * For example:
-   *
    *     bigquery.googleapis.com/projects/PROJECTID/datasets/DATASETID
    * or
    *     projects/PROJECTID/datasets/DATASETID
@@ -103,7 +101,6 @@ public interface AuthorizationInfoOrBuilder
    * <pre>
    * Resource attributes used in IAM condition evaluation. This field contains
    * resource attributes like resource type and resource name.
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.request_metadata.request_attributes`.
@@ -120,7 +117,6 @@ public interface AuthorizationInfoOrBuilder
    * <pre>
    * Resource attributes used in IAM condition evaluation. This field contains
    * resource attributes like resource type and resource name.
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.request_metadata.request_attributes`.
@@ -137,7 +133,6 @@ public interface AuthorizationInfoOrBuilder
    * <pre>
    * Resource attributes used in IAM condition evaluation. This field contains
    * resource attributes like resource type and resource name.
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.request_metadata.request_attributes`.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfo.java
index 4f5fc51e68..ca555dfe16 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfo.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OrgPolicyViolationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_OrgPolicyViolationInfo_descriptor;
@@ -214,7 +219,6 @@ public int getResourceTagsCount() {
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -243,7 +247,6 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTags() {
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -263,7 +266,6 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTagsMap() {
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -290,7 +292,6 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTagsMap() {
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -727,6 +728,39 @@ private void buildPartial0(com.google.cloud.audit.OrgPolicyViolationInfo result)
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.OrgPolicyViolationInfo) {
@@ -1201,7 +1235,6 @@ public int getResourceTagsCount() {
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
@@ -1230,7 +1263,6 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTags() {
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
@@ -1250,7 +1282,6 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTagsMap() {
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
@@ -1277,7 +1308,6 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTagsMap() {
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
@@ -1310,7 +1340,6 @@ public Builder clearResourceTags() {
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
@@ -1339,7 +1368,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableResourceTags(
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
@@ -1366,7 +1394,6 @@ public Builder putResourceTags(java.lang.String key, java.lang.String value) {
      * Optional. Tags referenced on the resource at the time of evaluation. These also
      * include the federated tags, if they are supplied in the CheckOrgPolicy
      * or CheckCustomConstraints Requests.
-     *
      * Optional field as of now. These tags are the Cloud tags that are
      * available on the resource during the policy evaluation and will
      * be available as part of the OrgPolicy check response for logging purposes.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfoOrBuilder.java
index 0cb4a4412c..e05a56411b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfoOrBuilder.java
@@ -98,7 +98,6 @@ public interface OrgPolicyViolationInfoOrBuilder
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -115,7 +114,6 @@ public interface OrgPolicyViolationInfoOrBuilder
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -135,7 +133,6 @@ public interface OrgPolicyViolationInfoOrBuilder
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -152,7 +149,6 @@ public interface OrgPolicyViolationInfoOrBuilder
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
@@ -173,7 +169,6 @@ java.lang.String getResourceTagsOrDefault(
    * Optional. Tags referenced on the resource at the time of evaluation. These also
    * include the federated tags, if they are supplied in the CheckOrgPolicy
    * or CheckCustomConstraints Requests.
-   *
    * Optional field as of now. These tags are the Cloud tags that are
    * available on the resource during the policy evaluation and will
    * be available as part of the OrgPolicy check response for logging purposes.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfo.java
index adc1754af9..d7e928e22b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfo.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyViolationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_PolicyViolationInfo_descriptor;
@@ -364,6 +369,39 @@ private void buildPartial0(com.google.cloud.audit.PolicyViolationInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.PolicyViolationInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java
index 2e196a6339..5a977fc9f0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RequestMetadata();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_RequestMetadata_descriptor;
@@ -146,7 +151,6 @@ public com.google.protobuf.ByteString getCallerIpBytes() {
    * The user agent of the caller.
    * This information is not authenticated and should be treated accordingly.
    * For example:
-   *
    * +   `google-api-python-client/1.4.0`:
    *     The request was made by the Google API client for Python.
    * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -179,7 +183,6 @@ public java.lang.String getCallerSuppliedUserAgent() {
    * The user agent of the caller.
    * This information is not authenticated and should be treated accordingly.
    * For example:
-   *
    * +   `google-api-python-client/1.4.0`:
    *     The request was made by the Google API client for Python.
    * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -219,7 +222,6 @@ public com.google.protobuf.ByteString getCallerSuppliedUserAgentBytes() {
    * (or project) as the accessed resource.
    * See https://cloud.google.com/compute/docs/vpc/ for more information.
    * This is a scheme-less URI full resource name. For example:
-   *
    *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
    * </pre>
    *
@@ -248,7 +250,6 @@ public java.lang.String getCallerNetwork() {
    * (or project) as the accessed resource.
    * See https://cloud.google.com/compute/docs/vpc/ for more information.
    * This is a scheme-less URI full resource name. For example:
-   *
    *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
    * </pre>
    *
@@ -278,8 +279,6 @@ public com.google.protobuf.ByteString getCallerNetworkBytes() {
    * Request attributes used in IAM condition evaluation. This field contains
    * request attributes like request time and access levels associated with
    * the request.
-   *
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.authentication_info.resource_attributes`.
@@ -300,8 +299,6 @@ public boolean hasRequestAttributes() {
    * Request attributes used in IAM condition evaluation. This field contains
    * request attributes like request time and access levels associated with
    * the request.
-   *
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.authentication_info.resource_attributes`.
@@ -324,8 +321,6 @@ public com.google.rpc.context.AttributeContext.Request getRequestAttributes() {
    * Request attributes used in IAM condition evaluation. This field contains
    * request attributes like request time and access levels associated with
    * the request.
-   *
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.authentication_info.resource_attributes`.
@@ -718,6 +713,39 @@ private void buildPartial0(com.google.cloud.audit.RequestMetadata result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.RequestMetadata) {
@@ -992,7 +1020,6 @@ public Builder setCallerIpBytes(com.google.protobuf.ByteString value) {
      * The user agent of the caller.
      * This information is not authenticated and should be treated accordingly.
      * For example:
-     *
      * +   `google-api-python-client/1.4.0`:
      *     The request was made by the Google API client for Python.
      * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -1024,7 +1051,6 @@ public java.lang.String getCallerSuppliedUserAgent() {
      * The user agent of the caller.
      * This information is not authenticated and should be treated accordingly.
      * For example:
-     *
      * +   `google-api-python-client/1.4.0`:
      *     The request was made by the Google API client for Python.
      * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -1056,7 +1082,6 @@ public com.google.protobuf.ByteString getCallerSuppliedUserAgentBytes() {
      * The user agent of the caller.
      * This information is not authenticated and should be treated accordingly.
      * For example:
-     *
      * +   `google-api-python-client/1.4.0`:
      *     The request was made by the Google API client for Python.
      * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -1087,7 +1112,6 @@ public Builder setCallerSuppliedUserAgent(java.lang.String value) {
      * The user agent of the caller.
      * This information is not authenticated and should be treated accordingly.
      * For example:
-     *
      * +   `google-api-python-client/1.4.0`:
      *     The request was made by the Google API client for Python.
      * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -1114,7 +1138,6 @@ public Builder clearCallerSuppliedUserAgent() {
      * The user agent of the caller.
      * This information is not authenticated and should be treated accordingly.
      * For example:
-     *
      * +   `google-api-python-client/1.4.0`:
      *     The request was made by the Google API client for Python.
      * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -1150,7 +1173,6 @@ public Builder setCallerSuppliedUserAgentBytes(com.google.protobuf.ByteString va
      * (or project) as the accessed resource.
      * See https://cloud.google.com/compute/docs/vpc/ for more information.
      * This is a scheme-less URI full resource name. For example:
-     *
      *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
      * </pre>
      *
@@ -1178,7 +1200,6 @@ public java.lang.String getCallerNetwork() {
      * (or project) as the accessed resource.
      * See https://cloud.google.com/compute/docs/vpc/ for more information.
      * This is a scheme-less URI full resource name. For example:
-     *
      *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
      * </pre>
      *
@@ -1206,7 +1227,6 @@ public com.google.protobuf.ByteString getCallerNetworkBytes() {
      * (or project) as the accessed resource.
      * See https://cloud.google.com/compute/docs/vpc/ for more information.
      * This is a scheme-less URI full resource name. For example:
-     *
      *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
      * </pre>
      *
@@ -1233,7 +1253,6 @@ public Builder setCallerNetwork(java.lang.String value) {
      * (or project) as the accessed resource.
      * See https://cloud.google.com/compute/docs/vpc/ for more information.
      * This is a scheme-less URI full resource name. For example:
-     *
      *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
      * </pre>
      *
@@ -1256,7 +1275,6 @@ public Builder clearCallerNetwork() {
      * (or project) as the accessed resource.
      * See https://cloud.google.com/compute/docs/vpc/ for more information.
      * This is a scheme-less URI full resource name. For example:
-     *
      *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
      * </pre>
      *
@@ -1289,8 +1307,6 @@ public Builder setCallerNetworkBytes(com.google.protobuf.ByteString value) {
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1310,8 +1326,6 @@ public boolean hasRequestAttributes() {
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1337,8 +1351,6 @@ public com.google.rpc.context.AttributeContext.Request getRequestAttributes() {
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1366,8 +1378,6 @@ public Builder setRequestAttributes(com.google.rpc.context.AttributeContext.Requ
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1393,8 +1403,6 @@ public Builder setRequestAttributes(
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1426,8 +1434,6 @@ public Builder mergeRequestAttributes(com.google.rpc.context.AttributeContext.Re
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1452,8 +1458,6 @@ public Builder clearRequestAttributes() {
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1473,8 +1477,6 @@ public com.google.rpc.context.AttributeContext.Request.Builder getRequestAttribu
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
@@ -1499,8 +1501,6 @@ public com.google.rpc.context.AttributeContext.Request.Builder getRequestAttribu
      * Request attributes used in IAM condition evaluation. This field contains
      * request attributes like request time and access levels associated with
      * the request.
-     *
-     *
      * To get the whole view of the attributes used in IAM
      * condition evaluation, the user must also look into
      * `AuditLog.authentication_info.resource_attributes`.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadataOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadataOrBuilder.java
index 9bfaafe790..593541486f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadataOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadataOrBuilder.java
@@ -75,7 +75,6 @@ public interface RequestMetadataOrBuilder
    * The user agent of the caller.
    * This information is not authenticated and should be treated accordingly.
    * For example:
-   *
    * +   `google-api-python-client/1.4.0`:
    *     The request was made by the Google API client for Python.
    * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -97,7 +96,6 @@ public interface RequestMetadataOrBuilder
    * The user agent of the caller.
    * This information is not authenticated and should be treated accordingly.
    * For example:
-   *
    * +   `google-api-python-client/1.4.0`:
    *     The request was made by the Google API client for Python.
    * +   `Cloud SDK Command Line Tool apitools-client/1.0 gcloud/0.9.62`:
@@ -122,7 +120,6 @@ public interface RequestMetadataOrBuilder
    * (or project) as the accessed resource.
    * See https://cloud.google.com/compute/docs/vpc/ for more information.
    * This is a scheme-less URI full resource name. For example:
-   *
    *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
    * </pre>
    *
@@ -140,7 +137,6 @@ public interface RequestMetadataOrBuilder
    * (or project) as the accessed resource.
    * See https://cloud.google.com/compute/docs/vpc/ for more information.
    * This is a scheme-less URI full resource name. For example:
-   *
    *     "//compute.googleapis.com/projects/PROJECT_ID/global/networks/NETWORK_ID"
    * </pre>
    *
@@ -157,8 +153,6 @@ public interface RequestMetadataOrBuilder
    * Request attributes used in IAM condition evaluation. This field contains
    * request attributes like request time and access levels associated with
    * the request.
-   *
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.authentication_info.resource_attributes`.
@@ -176,8 +170,6 @@ public interface RequestMetadataOrBuilder
    * Request attributes used in IAM condition evaluation. This field contains
    * request attributes like request time and access levels associated with
    * the request.
-   *
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.authentication_info.resource_attributes`.
@@ -195,8 +187,6 @@ public interface RequestMetadataOrBuilder
    * Request attributes used in IAM condition evaluation. This field contains
    * request attributes like request time and access levels associated with
    * the request.
-   *
-   *
    * To get the whole view of the attributes used in IAM
    * condition evaluation, the user must also look into
    * `AuditLog.authentication_info.resource_attributes`.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java
index f8285e172d..0c5b2caaa2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java
@@ -38,8 +38,8 @@ private ResourceLocation(com.google.protobuf.GeneratedMessageV3.Builder<?> build
   }
 
   private ResourceLocation() {
-    currentLocations_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    originalLocations_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    currentLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    originalLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResourceLocation();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_ResourceLocation_descriptor;
@@ -66,8 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public static final int CURRENT_LOCATIONS_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList currentLocations_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList currentLocations_;
   /**
    *
    *
@@ -76,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -97,7 +100,6 @@ public com.google.protobuf.ProtocolStringList getCurrentLocationsList() {
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -118,7 +120,6 @@ public int getCurrentLocationsCount() {
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -140,7 +141,6 @@ public java.lang.String getCurrentLocations(int index) {
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -158,8 +158,7 @@ public com.google.protobuf.ByteString getCurrentLocationsBytes(int index) {
   public static final int ORIGINAL_LOCATIONS_FIELD_NUMBER = 2;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList originalLocations_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList originalLocations_;
   /**
    *
    *
@@ -168,7 +167,6 @@ public com.google.protobuf.ByteString getCurrentLocationsBytes(int index) {
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -189,7 +187,6 @@ public com.google.protobuf.ProtocolStringList getOriginalLocationsList() {
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -210,7 +207,6 @@ public int getOriginalLocationsCount() {
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -232,7 +228,6 @@ public java.lang.String getOriginalLocations(int index) {
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -467,8 +462,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     public Builder clear() {
       super.clear();
       bitField0_ = 0;
-      currentLocations_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      originalLocations_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      currentLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      originalLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -496,6 +493,7 @@ public com.google.cloud.audit.ResourceLocation build() {
     public com.google.cloud.audit.ResourceLocation buildPartial() {
       com.google.cloud.audit.ResourceLocation result =
           new com.google.cloud.audit.ResourceLocation(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -503,16 +501,54 @@ public com.google.cloud.audit.ResourceLocation buildPartial() {
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.audit.ResourceLocation result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        currentLocations_.makeImmutable();
-        result.currentLocations_ = currentLocations_;
+    private void buildPartialRepeatedFields(com.google.cloud.audit.ResourceLocation result) {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        currentLocations_ = currentLocations_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        originalLocations_.makeImmutable();
-        result.originalLocations_ = originalLocations_;
+      result.currentLocations_ = currentLocations_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        originalLocations_ = originalLocations_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
+      result.originalLocations_ = originalLocations_;
+    }
+
+    private void buildPartial0(com.google.cloud.audit.ResourceLocation result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -530,7 +566,7 @@ public Builder mergeFrom(com.google.cloud.audit.ResourceLocation other) {
       if (!other.currentLocations_.isEmpty()) {
         if (currentLocations_.isEmpty()) {
           currentLocations_ = other.currentLocations_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureCurrentLocationsIsMutable();
           currentLocations_.addAll(other.currentLocations_);
@@ -540,7 +576,7 @@ public Builder mergeFrom(com.google.cloud.audit.ResourceLocation other) {
       if (!other.originalLocations_.isEmpty()) {
         if (originalLocations_.isEmpty()) {
           originalLocations_ = other.originalLocations_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureOriginalLocationsIsMutable();
           originalLocations_.addAll(other.originalLocations_);
@@ -606,14 +642,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList currentLocations_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList currentLocations_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureCurrentLocationsIsMutable() {
-      if (!currentLocations_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         currentLocations_ = new com.google.protobuf.LazyStringArrayList(currentLocations_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
     /**
      *
@@ -623,7 +659,6 @@ private void ensureCurrentLocationsIsMutable() {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -634,8 +669,7 @@ private void ensureCurrentLocationsIsMutable() {
      * @return A list containing the currentLocations.
      */
     public com.google.protobuf.ProtocolStringList getCurrentLocationsList() {
-      currentLocations_.makeImmutable();
-      return currentLocations_;
+      return currentLocations_.getUnmodifiableView();
     }
     /**
      *
@@ -645,7 +679,6 @@ public com.google.protobuf.ProtocolStringList getCurrentLocationsList() {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -666,7 +699,6 @@ public int getCurrentLocationsCount() {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -688,7 +720,6 @@ public java.lang.String getCurrentLocations(int index) {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -710,7 +741,6 @@ public com.google.protobuf.ByteString getCurrentLocationsBytes(int index) {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -728,7 +758,6 @@ public Builder setCurrentLocations(int index, java.lang.String value) {
       }
       ensureCurrentLocationsIsMutable();
       currentLocations_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -740,7 +769,6 @@ public Builder setCurrentLocations(int index, java.lang.String value) {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -757,7 +785,6 @@ public Builder addCurrentLocations(java.lang.String value) {
       }
       ensureCurrentLocationsIsMutable();
       currentLocations_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -769,7 +796,6 @@ public Builder addCurrentLocations(java.lang.String value) {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -783,7 +809,6 @@ public Builder addCurrentLocations(java.lang.String value) {
     public Builder addAllCurrentLocations(java.lang.Iterable<java.lang.String> values) {
       ensureCurrentLocationsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, currentLocations_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,7 +820,6 @@ public Builder addAllCurrentLocations(java.lang.Iterable<java.lang.String> value
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -806,9 +830,8 @@ public Builder addAllCurrentLocations(java.lang.Iterable<java.lang.String> value
      * @return This builder for chaining.
      */
     public Builder clearCurrentLocations() {
-      currentLocations_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      currentLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -820,7 +843,6 @@ public Builder clearCurrentLocations() {
      * Requests to create or delete a location based resource must populate
      * the 'current_locations' field and not the 'original_locations' field.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -838,19 +860,18 @@ public Builder addCurrentLocationsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureCurrentLocationsIsMutable();
       currentLocations_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList originalLocations_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList originalLocations_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureOriginalLocationsIsMutable() {
-      if (!originalLocations_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         originalLocations_ = new com.google.protobuf.LazyStringArrayList(originalLocations_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000002;
     }
     /**
      *
@@ -860,7 +881,6 @@ private void ensureOriginalLocationsIsMutable() {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -871,8 +891,7 @@ private void ensureOriginalLocationsIsMutable() {
      * @return A list containing the originalLocations.
      */
     public com.google.protobuf.ProtocolStringList getOriginalLocationsList() {
-      originalLocations_.makeImmutable();
-      return originalLocations_;
+      return originalLocations_.getUnmodifiableView();
     }
     /**
      *
@@ -882,7 +901,6 @@ public com.google.protobuf.ProtocolStringList getOriginalLocationsList() {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -903,7 +921,6 @@ public int getOriginalLocationsCount() {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -925,7 +942,6 @@ public java.lang.String getOriginalLocations(int index) {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -947,7 +963,6 @@ public com.google.protobuf.ByteString getOriginalLocationsBytes(int index) {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -965,7 +980,6 @@ public Builder setOriginalLocations(int index, java.lang.String value) {
       }
       ensureOriginalLocationsIsMutable();
       originalLocations_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -977,7 +991,6 @@ public Builder setOriginalLocations(int index, java.lang.String value) {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -994,7 +1007,6 @@ public Builder addOriginalLocations(java.lang.String value) {
       }
       ensureOriginalLocationsIsMutable();
       originalLocations_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1006,7 +1018,6 @@ public Builder addOriginalLocations(java.lang.String value) {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -1020,7 +1031,6 @@ public Builder addOriginalLocations(java.lang.String value) {
     public Builder addAllOriginalLocations(java.lang.Iterable<java.lang.String> values) {
       ensureOriginalLocationsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, originalLocations_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1032,7 +1042,6 @@ public Builder addAllOriginalLocations(java.lang.Iterable<java.lang.String> valu
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -1043,9 +1052,8 @@ public Builder addAllOriginalLocations(java.lang.Iterable<java.lang.String> valu
      * @return This builder for chaining.
      */
     public Builder clearOriginalLocations() {
-      originalLocations_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      originalLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      ;
       onChanged();
       return this;
     }
@@ -1057,7 +1065,6 @@ public Builder clearOriginalLocations() {
      * Requests that mutate the resource's location must populate both the
      * 'original_locations' as well as the 'current_locations' fields.
      * For example:
-     *
      *     "europe-west1-a"
      *     "us-east1"
      *     "nam3"
@@ -1075,7 +1082,6 @@ public Builder addOriginalLocationsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureOriginalLocationsIsMutable();
       originalLocations_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocationOrBuilder.java
index 7849d69394..2a0e76f4af 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocationOrBuilder.java
@@ -31,7 +31,6 @@ public interface ResourceLocationOrBuilder
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -50,7 +49,6 @@ public interface ResourceLocationOrBuilder
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -69,7 +67,6 @@ public interface ResourceLocationOrBuilder
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -89,7 +86,6 @@ public interface ResourceLocationOrBuilder
    * Requests to create or delete a location based resource must populate
    * the 'current_locations' field and not the 'original_locations' field.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -110,7 +106,6 @@ public interface ResourceLocationOrBuilder
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -129,7 +124,6 @@ public interface ResourceLocationOrBuilder
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -148,7 +142,6 @@ public interface ResourceLocationOrBuilder
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
@@ -168,7 +161,6 @@ public interface ResourceLocationOrBuilder
    * Requests that mutate the resource's location must populate both the
    * 'original_locations' as well as the 'current_locations' fields.
    * For example:
-   *
    *     "europe-west1-a"
    *     "us-east1"
    *     "nam3"
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java
index 8fcdd8e180..e0a88f5878 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ServiceAccountDelegationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_ServiceAccountDelegationInfo_descriptor;
@@ -156,6 +161,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new FirstPartyPrincipal();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.cloud.audit.AuditLogProto
           .internal_static_google_cloud_audit_ServiceAccountDelegationInfo_FirstPartyPrincipal_descriptor;
@@ -548,6 +558,41 @@ private void buildPartial0(
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other
@@ -1055,6 +1100,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ThirdPartyPrincipal();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.cloud.audit.AuditLogProto
           .internal_static_google_cloud_audit_ServiceAccountDelegationInfo_ThirdPartyPrincipal_descriptor;
@@ -1385,6 +1435,41 @@ private void buildPartial0(
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other
@@ -1709,8 +1794,6 @@ public com.google.protobuf.Parser<ThirdPartyPrincipal> getParserForType() {
   }
 
   private int authorityCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object authority_;
 
   public enum AuthorityCase
@@ -2243,6 +2326,39 @@ private void buildPartialOneofs(com.google.cloud.audit.ServiceAccountDelegationI
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.ServiceAccountDelegationInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfoOrBuilder.java
index eaad80e169..6dd5b65ce7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfoOrBuilder.java
@@ -142,5 +142,5 @@ public interface ServiceAccountDelegationInfoOrBuilder
   com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipalOrBuilder
       getThirdPartyPrincipalOrBuilder();
 
-  com.google.cloud.audit.ServiceAccountDelegationInfo.AuthorityCase getAuthorityCase();
+  public com.google.cloud.audit.ServiceAccountDelegationInfo.AuthorityCase getAuthorityCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java
index 826d358967..3311f42a98 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ViolationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_ViolationInfo_descriptor;
@@ -718,6 +723,39 @@ private void buildPartial0(com.google.cloud.audit.ViolationInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.audit.ViolationInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java
index a937d732cc..ccb3932003 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetLocationRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_GetLocationRequest_descriptor;
@@ -353,6 +358,39 @@ private void buildPartial0(com.google.cloud.location.GetLocationRequest result)
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.location.GetLocationRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java
index 7e22e7b460..8f0385f283 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListLocationsRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_ListLocationsRequest_descriptor;
@@ -514,6 +519,39 @@ private void buildPartial0(com.google.cloud.location.ListLocationsRequest result
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.location.ListLocationsRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java
index cadb55c215..5367d42a46 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListLocationsResponse();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_ListLocationsResponse_descriptor;
@@ -457,6 +462,39 @@ private void buildPartial0(com.google.cloud.location.ListLocationsResponse resul
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.location.ListLocationsResponse) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java
index 8901862270..936101f085 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Location();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_Location_descriptor;
@@ -263,7 +268,6 @@ public int getLabelsCount() {
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -287,7 +291,6 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -302,7 +305,6 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -324,7 +326,6 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -718,6 +719,39 @@ private void buildPartial0(com.google.cloud.location.Location result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.location.Location) {
@@ -1189,7 +1223,6 @@ public int getLabelsCount() {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
@@ -1213,7 +1246,6 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
@@ -1228,7 +1260,6 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
@@ -1250,7 +1281,6 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
@@ -1278,7 +1308,6 @@ public Builder clearLabels() {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
@@ -1302,7 +1331,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
@@ -1324,7 +1352,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      *
      * <pre>
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java
index 4b358ed53d..72eade68c2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java
@@ -107,7 +107,6 @@ public interface LocationOrBuilder
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -119,7 +118,6 @@ public interface LocationOrBuilder
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -134,7 +132,6 @@ public interface LocationOrBuilder
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -146,7 +143,6 @@ public interface LocationOrBuilder
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
@@ -162,7 +158,6 @@ java.lang.String getLabelsOrDefault(
    *
    * <pre>
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java
index 1e19140b74..c0eaf905ee 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java
@@ -27,26 +27,18 @@
  * its boundary. The latitude bounds must range between -90 to 90 degrees
  * inclusive, and the longitude bounds must range between -180 to 180 degrees
  * inclusive. Various cases include:
- *
  *  - If `low` = `high`, the viewport consists of that single point.
- *
  *  - If `low.longitude` &gt; `high.longitude`, the longitude range is inverted
  *    (the viewport crosses the 180 degree longitude line).
- *
  *  - If `low.longitude` = -180 degrees and `high.longitude` = 180 degrees,
  *    the viewport includes all longitudes.
- *
  *  - If `low.longitude` = 180 degrees and `high.longitude` = -180 degrees,
  *    the longitude range is empty.
- *
  *  - If `low.latitude` &gt; `high.latitude`, the latitude range is empty.
- *
  * Both `low` and `high` must be populated, and the represented box cannot be
  * empty (as specified by the definitions above). An empty viewport will result
  * in an error.
- *
  * For example, this viewport fully encloses New York City:
- *
  * {
  *     "low": {
  *         "latitude": 40.477398,
@@ -79,6 +71,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Viewport();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.geo.type.ViewportProto.internal_static_google_geo_type_Viewport_descriptor;
   }
@@ -369,26 +366,18 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * its boundary. The latitude bounds must range between -90 to 90 degrees
    * inclusive, and the longitude bounds must range between -180 to 180 degrees
    * inclusive. Various cases include:
-   *
    *  - If `low` = `high`, the viewport consists of that single point.
-   *
    *  - If `low.longitude` &gt; `high.longitude`, the longitude range is inverted
    *    (the viewport crosses the 180 degree longitude line).
-   *
    *  - If `low.longitude` = -180 degrees and `high.longitude` = 180 degrees,
    *    the viewport includes all longitudes.
-   *
    *  - If `low.longitude` = 180 degrees and `high.longitude` = -180 degrees,
    *    the longitude range is empty.
-   *
    *  - If `low.latitude` &gt; `high.latitude`, the latitude range is empty.
-   *
    * Both `low` and `high` must be populated, and the represented box cannot be
    * empty (as specified by the definitions above). An empty viewport will result
    * in an error.
-   *
    * For example, this viewport fully encloses New York City:
-   *
    * {
    *     "low": {
    *         "latitude": 40.477398,
@@ -483,6 +472,39 @@ private void buildPartial0(com.google.geo.type.Viewport result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.geo.type.Viewport) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
index b22db62e2a..37a52d34c9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
@@ -55,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new HttpRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.logging.type.HttpRequestProto
         .internal_static_google_logging_type_HttpRequest_descriptor;
@@ -1063,6 +1068,39 @@ private void buildPartial0(com.google.logging.type.HttpRequest result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.type.HttpRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverity.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverity.java
index 7238de705c..4ec7bfe118 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverity.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverity.java
@@ -26,13 +26,10 @@
  * standard severity levels listed below.  For your reference, the levels are
  * assigned the listed numeric values. The effect of using numeric values other
  * than those listed is undefined.
- *
  * You can filter for log entries by severity.  For example, the following
  * filter expression will match log entries with severities `INFO`, `NOTICE`,
  * and `WARNING`:
- *
  *     severity &gt; DEBUG AND severity &lt;= WARNING
- *
  * If you are writing log entries, you should map other severity encodings to
  * one of these standard levels. For example, you might map all of Java's FINE,
  * FINER, and FINEST levels to `LogSeverity.DEBUG`. You can preserve the
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
index 6868f36b0b..455e6539e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CancelOperationRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_CancelOperationRequest_descriptor;
@@ -353,6 +358,39 @@ private void buildPartial0(com.google.longrunning.CancelOperationRequest result)
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.CancelOperationRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
index 8b4370dcff..5d74c7f44c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteOperationRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_DeleteOperationRequest_descriptor;
@@ -353,6 +358,39 @@ private void buildPartial0(com.google.longrunning.DeleteOperationRequest result)
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.DeleteOperationRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
index b78572086b..c815fad8a1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetOperationRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_GetOperationRequest_descriptor;
@@ -353,6 +358,39 @@ private void buildPartial0(com.google.longrunning.GetOperationRequest result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.GetOperationRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
index b8936085a2..7da625be76 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListOperationsRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_ListOperationsRequest_descriptor;
@@ -514,6 +519,39 @@ private void buildPartial0(com.google.longrunning.ListOperationsRequest result)
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.ListOperationsRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
index e33b47c235..af082c12a4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListOperationsResponse();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_ListOperationsResponse_descriptor;
@@ -456,6 +461,39 @@ private void buildPartial0(com.google.longrunning.ListOperationsResponse result)
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.ListOperationsResponse) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
index a1c86193fe..16832c02ce 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Operation();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_Operation_descriptor;
@@ -63,8 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int resultCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object result_;
 
   public enum ResultCase
@@ -696,6 +699,39 @@ private void buildPartialOneofs(com.google.longrunning.Operation result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.Operation) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java
index 389f656706..8e6dd32dd9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java
@@ -23,9 +23,7 @@
  *
  * <pre>
  * A message representing the message types used by a long-running operation.
- *
  * Example:
- *
  *   rpc LongRunningRecognize(LongRunningRecognizeRequest)
  *       returns (google.longrunning.Operation) {
  *     option (google.longrunning.operation_info) = {
@@ -58,6 +56,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OperationInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_OperationInfo_descriptor;
@@ -84,10 +87,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 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.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -114,10 +115,8 @@ public java.lang.String getResponseType() {
    * 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.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -148,10 +147,8 @@ public com.google.protobuf.ByteString getResponseTypeBytes() {
    * <pre>
    * Required. The message name of the metadata type for this long-running
    * operation.
-   *
    * If the response is in a different package from the rpc, a fully-qualified
    * message name must be used (e.g. `google.protobuf.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -177,10 +174,8 @@ public java.lang.String getMetadataType() {
    * <pre>
    * Required. The message name of the metadata type for this long-running
    * operation.
-   *
    * If the response is in a different package from the rpc, a fully-qualified
    * message name must be used (e.g. `google.protobuf.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -372,9 +367,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * A message representing the message types used by a long-running operation.
-   *
    * Example:
-   *
    *   rpc LongRunningRecognize(LongRunningRecognizeRequest)
    *       returns (google.longrunning.Operation) {
    *     option (google.longrunning.operation_info) = {
@@ -461,6 +454,39 @@ private void buildPartial0(com.google.longrunning.OperationInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.OperationInfo) {
@@ -548,10 +574,8 @@ public Builder mergeFrom(
      * 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.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -577,10 +601,8 @@ public java.lang.String getResponseType() {
      * 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.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -606,10 +628,8 @@ public com.google.protobuf.ByteString getResponseTypeBytes() {
      * 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.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -634,10 +654,8 @@ public Builder setResponseType(java.lang.String value) {
      * 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.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -658,10 +676,8 @@ public Builder clearResponseType() {
      * 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.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -688,10 +704,8 @@ public Builder setResponseTypeBytes(com.google.protobuf.ByteString value) {
      * <pre>
      * Required. The message name of the metadata type for this long-running
      * operation.
-     *
      * If the response is in a different package from the rpc, a fully-qualified
      * message name must be used (e.g. `google.protobuf.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -716,10 +730,8 @@ public java.lang.String getMetadataType() {
      * <pre>
      * Required. The message name of the metadata type for this long-running
      * operation.
-     *
      * If the response is in a different package from the rpc, a fully-qualified
      * message name must be used (e.g. `google.protobuf.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -744,10 +756,8 @@ public com.google.protobuf.ByteString getMetadataTypeBytes() {
      * <pre>
      * Required. The message name of the metadata type for this long-running
      * operation.
-     *
      * If the response is in a different package from the rpc, a fully-qualified
      * message name must be used (e.g. `google.protobuf.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -771,10 +781,8 @@ public Builder setMetadataType(java.lang.String value) {
      * <pre>
      * Required. The message name of the metadata type for this long-running
      * operation.
-     *
      * If the response is in a different package from the rpc, a fully-qualified
      * message name must be used (e.g. `google.protobuf.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
@@ -794,10 +802,8 @@ public Builder clearMetadataType() {
      * <pre>
      * Required. The message name of the metadata type for this long-running
      * operation.
-     *
      * If the response is in a different package from the rpc, a fully-qualified
      * message name must be used (e.g. `google.protobuf.Struct`).
-     *
      * Note: Altering this value constitutes a breaking change.
      * </pre>
      *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfoOrBuilder.java
index e0d5a389f2..2e65c6e69c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfoOrBuilder.java
@@ -30,10 +30,8 @@ public interface OperationInfoOrBuilder
    * 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.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -49,10 +47,8 @@ public interface OperationInfoOrBuilder
    * 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.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -68,10 +64,8 @@ public interface OperationInfoOrBuilder
    * <pre>
    * Required. The message name of the metadata type for this long-running
    * operation.
-   *
    * If the response is in a different package from the rpc, a fully-qualified
    * message name must be used (e.g. `google.protobuf.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
@@ -86,10 +80,8 @@ public interface OperationInfoOrBuilder
    * <pre>
    * Required. The message name of the metadata type for this long-running
    * operation.
-   *
    * If the response is in a different package from the rpc, a fully-qualified
    * message name must be used (e.g. `google.protobuf.Struct`).
-   *
    * Note: Altering this value constitutes a breaking change.
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationOrBuilder.java
index 5ed218983d..beb4b5e4d0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationOrBuilder.java
@@ -202,5 +202,5 @@ public interface OperationOrBuilder
    */
   com.google.protobuf.AnyOrBuilder getResponseOrBuilder();
 
-  com.google.longrunning.Operation.ResultCase getResultCase();
+  public com.google.longrunning.Operation.ResultCase getResultCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java
index 18dae2a6fb..781db90574 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationsProto.java
@@ -37,7 +37,6 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    * Additional information regarding long-running operations.
    * In particular, this specifies the types that are returned from
    * long-running operations.
-   *
    * Required for methods that return `google.longrunning.Operation`; invalid
    * otherwise.
    * </pre>
@@ -117,18 +116,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "pe\030\002 \001(\t2\252\005\n\nOperations\022\224\001\n\016ListOperatio"
           + "ns\022).google.longrunning.ListOperationsRe"
           + "quest\032*.google.longrunning.ListOperation"
-          + "sResponse\"+\332A\013name,filter\202\323\344\223\002\027\022\025/v1/{na"
-          + "me=operations}\022\177\n\014GetOperation\022\'.google."
+          + "sResponse\"+\202\323\344\223\002\027\022\025/v1/{name=operations}"
+          + "\332A\013name,filter\022\177\n\014GetOperation\022\'.google."
           + "longrunning.GetOperationRequest\032\035.google"
-          + ".longrunning.Operation\"\'\332A\004name\202\323\344\223\002\032\022\030/"
-          + "v1/{name=operations/**}\022~\n\017DeleteOperati"
+          + ".longrunning.Operation\"\'\202\323\344\223\002\032\022\030/v1/{nam"
+          + "e=operations/**}\332A\004name\022~\n\017DeleteOperati"
           + "on\022*.google.longrunning.DeleteOperationR"
-          + "equest\032\026.google.protobuf.Empty\"\'\332A\004name\202"
-          + "\323\344\223\002\032*\030/v1/{name=operations/**}\022\210\001\n\017Canc"
+          + "equest\032\026.google.protobuf.Empty\"\'\202\323\344\223\002\032*\030"
+          + "/v1/{name=operations/**}\332A\004name\022\210\001\n\017Canc"
           + "elOperation\022*.google.longrunning.CancelO"
           + "perationRequest\032\026.google.protobuf.Empty\""
-          + "1\332A\004name\202\323\344\223\002$\"\037/v1/{name=operations/**}"
-          + ":cancel:\001*\022Z\n\rWaitOperation\022(.google.lon"
+          + "1\202\323\344\223\002$\"\037/v1/{name=operations/**}:cancel"
+          + ":\001*\332A\004name\022Z\n\rWaitOperation\022(.google.lon"
           + "grunning.WaitOperationRequest\032\035.google.l"
           + "ongrunning.Operation\"\000\032\035\312A\032longrunning.g"
           + "oogleapis.com:Z\n\016operation_info\022\036.google"
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java
index 006f0ed47d..69570f9b3c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new WaitOperationRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_WaitOperationRequest_descriptor;
@@ -427,6 +432,39 @@ private void buildPartial0(com.google.longrunning.WaitOperationRequest result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.longrunning.WaitOperationRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
index cf63124ea9..417e4ab37f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BadRequest();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_descriptor;
   }
@@ -72,9 +77,7 @@ public interface FieldViolationOrBuilder
      * A path that leads to a field in the request body. The value will be a
      * sequence of dot-separated identifiers that identify a protocol buffer
      * field.
-     *
      * Consider the following:
-     *
      *     message CreateContactRequest {
      *       message EmailAddress {
      *         enum Type {
@@ -82,25 +85,19 @@ public interface FieldViolationOrBuilder
      *           HOME = 1;
      *           WORK = 2;
      *         }
-     *
      *         optional string email = 1;
      *         repeated EmailType type = 2;
      *       }
-     *
      *       string full_name = 1;
      *       repeated EmailAddress email_addresses = 2;
      *     }
-     *
      * In this example, in proto `field` could take one of the following values:
-     *
      * * `full_name` for a violation in the `full_name` value
      * * `email_addresses[1].email` for a violation in the `email` field of the
      *   first `email_addresses` message
      * * `email_addresses[3].type[2]` for a violation in the second `type`
      *   value in the third `email_addresses` message.
-     *
      * In JSON, the same values are represented as:
-     *
      * * `fullName` for a violation in the `fullName` value
      * * `emailAddresses[1].email` for a violation in the `email` field of the
      *   first `emailAddresses` message
@@ -120,9 +117,7 @@ public interface FieldViolationOrBuilder
      * A path that leads to a field in the request body. The value will be a
      * sequence of dot-separated identifiers that identify a protocol buffer
      * field.
-     *
      * Consider the following:
-     *
      *     message CreateContactRequest {
      *       message EmailAddress {
      *         enum Type {
@@ -130,25 +125,19 @@ public interface FieldViolationOrBuilder
      *           HOME = 1;
      *           WORK = 2;
      *         }
-     *
      *         optional string email = 1;
      *         repeated EmailType type = 2;
      *       }
-     *
      *       string full_name = 1;
      *       repeated EmailAddress email_addresses = 2;
      *     }
-     *
      * In this example, in proto `field` could take one of the following values:
-     *
      * * `full_name` for a violation in the `full_name` value
      * * `email_addresses[1].email` for a violation in the `email` field of the
      *   first `email_addresses` message
      * * `email_addresses[3].type[2]` for a violation in the second `type`
      *   value in the third `email_addresses` message.
-     *
      * In JSON, the same values are represented as:
-     *
      * * `fullName` for a violation in the `fullName` value
      * * `emailAddresses[1].email` for a violation in the `email` field of the
      *   first `emailAddresses` message
@@ -217,6 +206,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new FieldViolation();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto
           .internal_static_google_rpc_BadRequest_FieldViolation_descriptor;
@@ -243,9 +237,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      * A path that leads to a field in the request body. The value will be a
      * sequence of dot-separated identifiers that identify a protocol buffer
      * field.
-     *
      * Consider the following:
-     *
      *     message CreateContactRequest {
      *       message EmailAddress {
      *         enum Type {
@@ -253,25 +245,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *           HOME = 1;
      *           WORK = 2;
      *         }
-     *
      *         optional string email = 1;
      *         repeated EmailType type = 2;
      *       }
-     *
      *       string full_name = 1;
      *       repeated EmailAddress email_addresses = 2;
      *     }
-     *
      * In this example, in proto `field` could take one of the following values:
-     *
      * * `full_name` for a violation in the `full_name` value
      * * `email_addresses[1].email` for a violation in the `email` field of the
      *   first `email_addresses` message
      * * `email_addresses[3].type[2]` for a violation in the second `type`
      *   value in the third `email_addresses` message.
-     *
      * In JSON, the same values are represented as:
-     *
      * * `fullName` for a violation in the `fullName` value
      * * `emailAddresses[1].email` for a violation in the `email` field of the
      *   first `emailAddresses` message
@@ -302,9 +288,7 @@ public java.lang.String getField() {
      * A path that leads to a field in the request body. The value will be a
      * sequence of dot-separated identifiers that identify a protocol buffer
      * field.
-     *
      * Consider the following:
-     *
      *     message CreateContactRequest {
      *       message EmailAddress {
      *         enum Type {
@@ -312,25 +296,19 @@ public java.lang.String getField() {
      *           HOME = 1;
      *           WORK = 2;
      *         }
-     *
      *         optional string email = 1;
      *         repeated EmailType type = 2;
      *       }
-     *
      *       string full_name = 1;
      *       repeated EmailAddress email_addresses = 2;
      *     }
-     *
      * In this example, in proto `field` could take one of the following values:
-     *
      * * `full_name` for a violation in the `full_name` value
      * * `email_addresses[1].email` for a violation in the `email` field of the
      *   first `email_addresses` message
      * * `email_addresses[3].type[2]` for a violation in the second `type`
      *   value in the third `email_addresses` message.
-     *
      * In JSON, the same values are represented as:
-     *
      * * `fullName` for a violation in the `fullName` value
      * * `emailAddresses[1].email` for a violation in the `email` field of the
      *   first `emailAddresses` message
@@ -661,6 +639,41 @@ private void buildPartial0(com.google.rpc.BadRequest.FieldViolation result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.BadRequest.FieldViolation) {
@@ -748,9 +761,7 @@ public Builder mergeFrom(
        * A path that leads to a field in the request body. The value will be a
        * sequence of dot-separated identifiers that identify a protocol buffer
        * field.
-       *
        * Consider the following:
-       *
        *     message CreateContactRequest {
        *       message EmailAddress {
        *         enum Type {
@@ -758,25 +769,19 @@ public Builder mergeFrom(
        *           HOME = 1;
        *           WORK = 2;
        *         }
-       *
        *         optional string email = 1;
        *         repeated EmailType type = 2;
        *       }
-       *
        *       string full_name = 1;
        *       repeated EmailAddress email_addresses = 2;
        *     }
-       *
        * In this example, in proto `field` could take one of the following values:
-       *
        * * `full_name` for a violation in the `full_name` value
        * * `email_addresses[1].email` for a violation in the `email` field of the
        *   first `email_addresses` message
        * * `email_addresses[3].type[2]` for a violation in the second `type`
        *   value in the third `email_addresses` message.
-       *
        * In JSON, the same values are represented as:
-       *
        * * `fullName` for a violation in the `fullName` value
        * * `emailAddresses[1].email` for a violation in the `email` field of the
        *   first `emailAddresses` message
@@ -806,9 +811,7 @@ public java.lang.String getField() {
        * A path that leads to a field in the request body. The value will be a
        * sequence of dot-separated identifiers that identify a protocol buffer
        * field.
-       *
        * Consider the following:
-       *
        *     message CreateContactRequest {
        *       message EmailAddress {
        *         enum Type {
@@ -816,25 +819,19 @@ public java.lang.String getField() {
        *           HOME = 1;
        *           WORK = 2;
        *         }
-       *
        *         optional string email = 1;
        *         repeated EmailType type = 2;
        *       }
-       *
        *       string full_name = 1;
        *       repeated EmailAddress email_addresses = 2;
        *     }
-       *
        * In this example, in proto `field` could take one of the following values:
-       *
        * * `full_name` for a violation in the `full_name` value
        * * `email_addresses[1].email` for a violation in the `email` field of the
        *   first `email_addresses` message
        * * `email_addresses[3].type[2]` for a violation in the second `type`
        *   value in the third `email_addresses` message.
-       *
        * In JSON, the same values are represented as:
-       *
        * * `fullName` for a violation in the `fullName` value
        * * `emailAddresses[1].email` for a violation in the `email` field of the
        *   first `emailAddresses` message
@@ -864,9 +861,7 @@ public com.google.protobuf.ByteString getFieldBytes() {
        * A path that leads to a field in the request body. The value will be a
        * sequence of dot-separated identifiers that identify a protocol buffer
        * field.
-       *
        * Consider the following:
-       *
        *     message CreateContactRequest {
        *       message EmailAddress {
        *         enum Type {
@@ -874,25 +869,19 @@ public com.google.protobuf.ByteString getFieldBytes() {
        *           HOME = 1;
        *           WORK = 2;
        *         }
-       *
        *         optional string email = 1;
        *         repeated EmailType type = 2;
        *       }
-       *
        *       string full_name = 1;
        *       repeated EmailAddress email_addresses = 2;
        *     }
-       *
        * In this example, in proto `field` could take one of the following values:
-       *
        * * `full_name` for a violation in the `full_name` value
        * * `email_addresses[1].email` for a violation in the `email` field of the
        *   first `email_addresses` message
        * * `email_addresses[3].type[2]` for a violation in the second `type`
        *   value in the third `email_addresses` message.
-       *
        * In JSON, the same values are represented as:
-       *
        * * `fullName` for a violation in the `fullName` value
        * * `emailAddresses[1].email` for a violation in the `email` field of the
        *   first `emailAddresses` message
@@ -921,9 +910,7 @@ public Builder setField(java.lang.String value) {
        * A path that leads to a field in the request body. The value will be a
        * sequence of dot-separated identifiers that identify a protocol buffer
        * field.
-       *
        * Consider the following:
-       *
        *     message CreateContactRequest {
        *       message EmailAddress {
        *         enum Type {
@@ -931,25 +918,19 @@ public Builder setField(java.lang.String value) {
        *           HOME = 1;
        *           WORK = 2;
        *         }
-       *
        *         optional string email = 1;
        *         repeated EmailType type = 2;
        *       }
-       *
        *       string full_name = 1;
        *       repeated EmailAddress email_addresses = 2;
        *     }
-       *
        * In this example, in proto `field` could take one of the following values:
-       *
        * * `full_name` for a violation in the `full_name` value
        * * `email_addresses[1].email` for a violation in the `email` field of the
        *   first `email_addresses` message
        * * `email_addresses[3].type[2]` for a violation in the second `type`
        *   value in the third `email_addresses` message.
-       *
        * In JSON, the same values are represented as:
-       *
        * * `fullName` for a violation in the `fullName` value
        * * `emailAddresses[1].email` for a violation in the `email` field of the
        *   first `emailAddresses` message
@@ -974,9 +955,7 @@ public Builder clearField() {
        * A path that leads to a field in the request body. The value will be a
        * sequence of dot-separated identifiers that identify a protocol buffer
        * field.
-       *
        * Consider the following:
-       *
        *     message CreateContactRequest {
        *       message EmailAddress {
        *         enum Type {
@@ -984,25 +963,19 @@ public Builder clearField() {
        *           HOME = 1;
        *           WORK = 2;
        *         }
-       *
        *         optional string email = 1;
        *         repeated EmailType type = 2;
        *       }
-       *
        *       string full_name = 1;
        *       repeated EmailAddress email_addresses = 2;
        *     }
-       *
        * In this example, in proto `field` could take one of the following values:
-       *
        * * `full_name` for a violation in the `full_name` value
        * * `email_addresses[1].email` for a violation in the `email` field of the
        *   first `email_addresses` message
        * * `email_addresses[3].type[2]` for a violation in the second `type`
        *   value in the third `email_addresses` message.
-       *
        * In JSON, the same values are represented as:
-       *
        * * `fullName` for a violation in the `fullName` value
        * * `emailAddresses[1].email` for a violation in the `email` field of the
        *   first `emailAddresses` message
@@ -1520,6 +1493,39 @@ private void buildPartial0(com.google.rpc.BadRequest result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.BadRequest) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Code.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Code.java
index a762494b4c..4e9024417f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Code.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Code.java
@@ -23,8 +23,6 @@
  *
  * <pre>
  * The canonical error codes for gRPC APIs.
- *
- *
  * Sometimes multiple error codes may apply.  Services should return
  * the most specific error code that applies.  For example, prefer
  * `OUT_OF_RANGE` over `FAILED_PRECONDITION` if both codes apply.
@@ -39,7 +37,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Not an error; returned on success.
-   *
    * HTTP Mapping: 200 OK
    * </pre>
    *
@@ -51,7 +48,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The operation was cancelled, typically by the caller.
-   *
    * HTTP Mapping: 499 Client Closed Request
    * </pre>
    *
@@ -67,7 +63,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * an error space that is not known in this address space.  Also
    * errors raised by APIs that do not return enough error information
    * may be converted to this error.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * </pre>
    *
@@ -82,7 +77,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * from `FAILED_PRECONDITION`.  `INVALID_ARGUMENT` indicates arguments
    * that are problematic regardless of the state of the system
    * (e.g., a malformed file name).
-   *
    * HTTP Mapping: 400 Bad Request
    * </pre>
    *
@@ -98,7 +92,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * even if the operation has completed successfully.  For example, a
    * successful response from a server could have been delayed long
    * enough for the deadline to expire.
-   *
    * HTTP Mapping: 504 Gateway Timeout
    * </pre>
    *
@@ -110,13 +103,11 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Some requested entity (e.g., file or directory) was not found.
-   *
    * Note to server developers: if a request is denied for an entire class
    * of users, such as gradual feature rollout or undocumented allowlist,
    * `NOT_FOUND` may be used. If a request is denied for some users within
    * a class of users, such as user-based access control, `PERMISSION_DENIED`
    * must be used.
-   *
    * HTTP Mapping: 404 Not Found
    * </pre>
    *
@@ -129,7 +120,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The entity that a client attempted to create (e.g., file or directory)
    * already exists.
-   *
    * HTTP Mapping: 409 Conflict
    * </pre>
    *
@@ -148,7 +138,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * instead for those errors). This error code does not imply the
    * request is valid or the requested entity exists or satisfies
    * other pre-conditions.
-   *
    * HTTP Mapping: 403 Forbidden
    * </pre>
    *
@@ -161,7 +150,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request does not have valid authentication credentials for the
    * operation.
-   *
    * HTTP Mapping: 401 Unauthorized
    * </pre>
    *
@@ -174,7 +162,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * Some resource has been exhausted, perhaps a per-user quota, or
    * perhaps the entire file system is out of space.
-   *
    * HTTP Mapping: 429 Too Many Requests
    * </pre>
    *
@@ -189,7 +176,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * required for the operation's execution.  For example, the directory
    * to be deleted is non-empty, an rmdir operation is applied to
    * a non-directory, etc.
-   *
    * Service implementors can use the following guidelines to decide
    * between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
    *  (a) Use `UNAVAILABLE` if the client can retry just the failing call.
@@ -201,7 +187,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *      fails because the directory is non-empty, `FAILED_PRECONDITION`
    *      should be returned since the client should not retry unless
    *      the files are deleted from the directory.
-   *
    * HTTP Mapping: 400 Bad Request
    * </pre>
    *
@@ -214,10 +199,8 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The operation was aborted, typically due to a concurrency issue such as
    * a sequencer check failure or transaction abort.
-   *
    * See the guidelines above for deciding between `FAILED_PRECONDITION`,
    * `ABORTED`, and `UNAVAILABLE`.
-   *
    * HTTP Mapping: 409 Conflict
    * </pre>
    *
@@ -230,20 +213,17 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The operation was attempted past the valid range.  E.g., seeking or
    * reading past end-of-file.
-   *
    * Unlike `INVALID_ARGUMENT`, this error indicates a problem that may
    * be fixed if the system state changes. For example, a 32-bit file
    * system will generate `INVALID_ARGUMENT` if asked to read at an
    * offset that is not in the range [0,2^32-1], but it will generate
    * `OUT_OF_RANGE` if asked to read from an offset past the current
    * file size.
-   *
    * There is a fair bit of overlap between `FAILED_PRECONDITION` and
    * `OUT_OF_RANGE`.  We recommend using `OUT_OF_RANGE` (the more specific
    * error) when it applies so that callers who are iterating through
    * a space can easily look for an `OUT_OF_RANGE` error to detect when
    * they are done.
-   *
    * HTTP Mapping: 400 Bad Request
    * </pre>
    *
@@ -256,7 +236,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The operation is not implemented or is not supported/enabled in this
    * service.
-   *
    * HTTP Mapping: 501 Not Implemented
    * </pre>
    *
@@ -270,7 +249,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * Internal errors.  This means that some invariants expected by the
    * underlying system have been broken.  This error code is reserved
    * for serious errors.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * </pre>
    *
@@ -285,10 +263,8 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * transient condition, which can be corrected by retrying with
    * a backoff. Note that it is not always safe to retry
    * non-idempotent operations.
-   *
    * See the guidelines above for deciding between `FAILED_PRECONDITION`,
    * `ABORTED`, and `UNAVAILABLE`.
-   *
    * HTTP Mapping: 503 Service Unavailable
    * </pre>
    *
@@ -300,7 +276,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Unrecoverable data loss or corruption.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * </pre>
    *
@@ -315,7 +290,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Not an error; returned on success.
-   *
    * HTTP Mapping: 200 OK
    * </pre>
    *
@@ -327,7 +301,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * The operation was cancelled, typically by the caller.
-   *
    * HTTP Mapping: 499 Client Closed Request
    * </pre>
    *
@@ -343,7 +316,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * an error space that is not known in this address space.  Also
    * errors raised by APIs that do not return enough error information
    * may be converted to this error.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * </pre>
    *
@@ -358,7 +330,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * from `FAILED_PRECONDITION`.  `INVALID_ARGUMENT` indicates arguments
    * that are problematic regardless of the state of the system
    * (e.g., a malformed file name).
-   *
    * HTTP Mapping: 400 Bad Request
    * </pre>
    *
@@ -374,7 +345,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * even if the operation has completed successfully.  For example, a
    * successful response from a server could have been delayed long
    * enough for the deadline to expire.
-   *
    * HTTP Mapping: 504 Gateway Timeout
    * </pre>
    *
@@ -386,13 +356,11 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Some requested entity (e.g., file or directory) was not found.
-   *
    * Note to server developers: if a request is denied for an entire class
    * of users, such as gradual feature rollout or undocumented allowlist,
    * `NOT_FOUND` may be used. If a request is denied for some users within
    * a class of users, such as user-based access control, `PERMISSION_DENIED`
    * must be used.
-   *
    * HTTP Mapping: 404 Not Found
    * </pre>
    *
@@ -405,7 +373,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The entity that a client attempted to create (e.g., file or directory)
    * already exists.
-   *
    * HTTP Mapping: 409 Conflict
    * </pre>
    *
@@ -424,7 +391,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * instead for those errors). This error code does not imply the
    * request is valid or the requested entity exists or satisfies
    * other pre-conditions.
-   *
    * HTTP Mapping: 403 Forbidden
    * </pre>
    *
@@ -437,7 +403,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The request does not have valid authentication credentials for the
    * operation.
-   *
    * HTTP Mapping: 401 Unauthorized
    * </pre>
    *
@@ -450,7 +415,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * Some resource has been exhausted, perhaps a per-user quota, or
    * perhaps the entire file system is out of space.
-   *
    * HTTP Mapping: 429 Too Many Requests
    * </pre>
    *
@@ -465,7 +429,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * required for the operation's execution.  For example, the directory
    * to be deleted is non-empty, an rmdir operation is applied to
    * a non-directory, etc.
-   *
    * Service implementors can use the following guidelines to decide
    * between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
    *  (a) Use `UNAVAILABLE` if the client can retry just the failing call.
@@ -477,7 +440,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *      fails because the directory is non-empty, `FAILED_PRECONDITION`
    *      should be returned since the client should not retry unless
    *      the files are deleted from the directory.
-   *
    * HTTP Mapping: 400 Bad Request
    * </pre>
    *
@@ -490,10 +452,8 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The operation was aborted, typically due to a concurrency issue such as
    * a sequencer check failure or transaction abort.
-   *
    * See the guidelines above for deciding between `FAILED_PRECONDITION`,
    * `ABORTED`, and `UNAVAILABLE`.
-   *
    * HTTP Mapping: 409 Conflict
    * </pre>
    *
@@ -506,20 +466,17 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The operation was attempted past the valid range.  E.g., seeking or
    * reading past end-of-file.
-   *
    * Unlike `INVALID_ARGUMENT`, this error indicates a problem that may
    * be fixed if the system state changes. For example, a 32-bit file
    * system will generate `INVALID_ARGUMENT` if asked to read at an
    * offset that is not in the range [0,2^32-1], but it will generate
    * `OUT_OF_RANGE` if asked to read from an offset past the current
    * file size.
-   *
    * There is a fair bit of overlap between `FAILED_PRECONDITION` and
    * `OUT_OF_RANGE`.  We recommend using `OUT_OF_RANGE` (the more specific
    * error) when it applies so that callers who are iterating through
    * a space can easily look for an `OUT_OF_RANGE` error to detect when
    * they are done.
-   *
    * HTTP Mapping: 400 Bad Request
    * </pre>
    *
@@ -532,7 +489,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * <pre>
    * The operation is not implemented or is not supported/enabled in this
    * service.
-   *
    * HTTP Mapping: 501 Not Implemented
    * </pre>
    *
@@ -546,7 +502,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * Internal errors.  This means that some invariants expected by the
    * underlying system have been broken.  This error code is reserved
    * for serious errors.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * </pre>
    *
@@ -561,10 +516,8 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * transient condition, which can be corrected by retrying with
    * a backoff. Note that it is not always safe to retry
    * non-idempotent operations.
-   *
    * See the guidelines above for deciding between `FAILED_PRECONDITION`,
    * `ABORTED`, and `UNAVAILABLE`.
-   *
    * HTTP Mapping: 503 Service Unavailable
    * </pre>
    *
@@ -576,7 +529,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * <pre>
    * Unrecoverable data loss or corruption.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * </pre>
    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
index e441862e79..278956d960 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
@@ -38,7 +38,7 @@ private DebugInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
   }
 
   private DebugInfo() {
-    stackEntries_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    stackEntries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     detail_ = "";
   }
 
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DebugInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_descriptor;
   }
@@ -63,8 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public static final int STACK_ENTRIES_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList stackEntries_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList stackEntries_;
   /**
    *
    *
@@ -385,7 +389,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     public Builder clear() {
       super.clear();
       bitField0_ = 0;
-      stackEntries_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      stackEntries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       detail_ = "";
       return this;
     }
@@ -412,6 +417,7 @@ public com.google.rpc.DebugInfo build() {
     @java.lang.Override
     public com.google.rpc.DebugInfo buildPartial() {
       com.google.rpc.DebugInfo result = new com.google.rpc.DebugInfo(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -419,17 +425,54 @@ public com.google.rpc.DebugInfo buildPartial() {
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.rpc.DebugInfo result) {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        stackEntries_ = stackEntries_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.stackEntries_ = stackEntries_;
+    }
+
     private void buildPartial0(com.google.rpc.DebugInfo result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        stackEntries_.makeImmutable();
-        result.stackEntries_ = stackEntries_;
-      }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.detail_ = detail_;
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.DebugInfo) {
@@ -445,7 +488,7 @@ public Builder mergeFrom(com.google.rpc.DebugInfo other) {
       if (!other.stackEntries_.isEmpty()) {
         if (stackEntries_.isEmpty()) {
           stackEntries_ = other.stackEntries_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureStackEntriesIsMutable();
           stackEntries_.addAll(other.stackEntries_);
@@ -515,14 +558,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList stackEntries_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList stackEntries_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureStackEntriesIsMutable() {
-      if (!stackEntries_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         stackEntries_ = new com.google.protobuf.LazyStringArrayList(stackEntries_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
     /**
      *
@@ -536,8 +579,7 @@ private void ensureStackEntriesIsMutable() {
      * @return A list containing the stackEntries.
      */
     public com.google.protobuf.ProtocolStringList getStackEntriesList() {
-      stackEntries_.makeImmutable();
-      return stackEntries_;
+      return stackEntries_.getUnmodifiableView();
     }
     /**
      *
@@ -602,7 +644,6 @@ public Builder setStackEntries(int index, java.lang.String value) {
       }
       ensureStackEntriesIsMutable();
       stackEntries_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -624,7 +665,6 @@ public Builder addStackEntries(java.lang.String value) {
       }
       ensureStackEntriesIsMutable();
       stackEntries_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -643,7 +683,6 @@ public Builder addStackEntries(java.lang.String value) {
     public Builder addAllStackEntries(java.lang.Iterable<java.lang.String> values) {
       ensureStackEntriesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, stackEntries_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -659,9 +698,8 @@ public Builder addAllStackEntries(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearStackEntries() {
-      stackEntries_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      stackEntries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -684,7 +722,6 @@ public Builder addStackEntriesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureStackEntriesIsMutable();
       stackEntries_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java
index cbab12ccfd..b5c4a71be2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java
@@ -23,10 +23,8 @@
  *
  * <pre>
  * Describes the cause of the error with structured details.
- *
  * Example of an error when contacting the "pubsub.googleapis.com" API when it
  * is not enabled:
- *
  *     { "reason": "API_DISABLED"
  *       "domain": "googleapis.com"
  *       "metadata": {
@@ -34,12 +32,9 @@
  *         "service": "pubsub.googleapis.com"
  *       }
  *     }
- *
  * This response indicates that the pubsub.googleapis.com API is not enabled.
- *
  * Example of an error that is returned when attempting to create a Spanner
  * instance in a region that is out of stock:
- *
  *     { "reason": "STOCKOUT"
  *       "domain": "spanner.googleapis.com",
  *       "metadata": {
@@ -71,6 +66,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ErrorInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ErrorInfo_descriptor;
   }
@@ -245,7 +245,6 @@ public int getMetadataCount() {
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -274,7 +273,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadata() {
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -294,7 +292,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -321,7 +318,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -532,10 +528,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Describes the cause of the error with structured details.
-   *
    * Example of an error when contacting the "pubsub.googleapis.com" API when it
    * is not enabled:
-   *
    *     { "reason": "API_DISABLED"
    *       "domain": "googleapis.com"
    *       "metadata": {
@@ -543,12 +537,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates that the pubsub.googleapis.com API is not enabled.
-   *
    * Example of an error that is returned when attempting to create a Spanner
    * instance in a region that is out of stock:
-   *
    *     { "reason": "STOCKOUT"
    *       "domain": "spanner.googleapis.com",
    *       "metadata": {
@@ -656,6 +647,39 @@ private void buildPartial0(com.google.rpc.ErrorInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.ErrorInfo) {
@@ -1037,7 +1061,6 @@ public int getMetadataCount() {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
@@ -1066,7 +1089,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadata() {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
@@ -1086,7 +1108,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
@@ -1113,7 +1134,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
@@ -1146,7 +1166,6 @@ public Builder clearMetadata() {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
@@ -1175,7 +1194,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
@@ -1202,7 +1220,6 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      *
      * <pre>
      * Additional structured details about this error.
-     *
      * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
      * should be contained in the key, not the value.  For example, rather than
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java
index f92f526b7f..c563c2a587 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java
@@ -96,7 +96,6 @@ public interface ErrorInfoOrBuilder
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -113,7 +112,6 @@ public interface ErrorInfoOrBuilder
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -133,7 +131,6 @@ public interface ErrorInfoOrBuilder
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -150,7 +147,6 @@ public interface ErrorInfoOrBuilder
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
@@ -171,7 +167,6 @@ java.lang.String getMetadataOrDefault(
    *
    * <pre>
    * Additional structured details about this error.
-   *
    * Keys should match /[a-zA-Z0-9-_]/ and be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
    * should be contained in the key, not the value.  For example, rather than
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Help.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
index 7f1ce9860f..e9063f68b9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
@@ -23,7 +23,6 @@
  *
  * <pre>
  * Provides links to documentation or for performing an out of band action.
- *
  * For example, if a quota check failed with an error indicating the calling
  * project hasn't enabled the accessed service, this can contain a URL pointing
  * directly to the right place in the developer console to flip the bit.
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Help();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_descriptor;
   }
@@ -148,6 +152,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Link();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_descriptor;
     }
@@ -512,6 +521,41 @@ private void buildPartial0(com.google.rpc.Help.Link result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.Help.Link) {
@@ -1101,7 +1145,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Provides links to documentation or for performing an out of band action.
-   *
    * For example, if a quota check failed with an error indicating the calling
    * project hasn't enabled the accessed service, this can contain a URL pointing
    * directly to the right place in the developer console to flip the bit.
@@ -1192,6 +1235,39 @@ private void buildPartial0(com.google.rpc.Help result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.Help) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
index 330854a8d7..b91c680d20 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new LocalizedMessage();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_descriptor;
   }
@@ -418,6 +423,39 @@ private void buildPartial0(com.google.rpc.LocalizedMessage result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.LocalizedMessage) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
index 30f84342e4..06c6a00f15 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
@@ -23,7 +23,6 @@
  *
  * <pre>
  * Describes what preconditions have failed.
- *
  * For example, if an RPC failed because it required the Terms of Service to be
  * acknowledged, it could list the terms of service violation in the
  * PreconditionFailure message.
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PreconditionFailure();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto
         .internal_static_google_rpc_PreconditionFailure_descriptor;
@@ -135,7 +139,6 @@ public interface ViolationOrBuilder
      * <pre>
      * A description of how the precondition failed. Developers can use this
      * description to understand how to fix the failure.
-     *
      * For example: "Terms of service not accepted".
      * </pre>
      *
@@ -150,7 +153,6 @@ public interface ViolationOrBuilder
      * <pre>
      * A description of how the precondition failed. Developers can use this
      * description to understand how to fix the failure.
-     *
      * For example: "Terms of service not accepted".
      * </pre>
      *
@@ -191,6 +193,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Violation();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto
           .internal_static_google_rpc_PreconditionFailure_Violation_descriptor;
@@ -326,7 +333,6 @@ public com.google.protobuf.ByteString getSubjectBytes() {
      * <pre>
      * A description of how the precondition failed. Developers can use this
      * description to understand how to fix the failure.
-     *
      * For example: "Terms of service not accepted".
      * </pre>
      *
@@ -352,7 +358,6 @@ public java.lang.String getDescription() {
      * <pre>
      * A description of how the precondition failed. Developers can use this
      * description to understand how to fix the failure.
-     *
      * For example: "Terms of service not accepted".
      * </pre>
      *
@@ -641,6 +646,41 @@ private void buildPartial0(com.google.rpc.PreconditionFailure.Violation result)
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.PreconditionFailure.Violation) {
@@ -970,7 +1010,6 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
        * <pre>
        * A description of how the precondition failed. Developers can use this
        * description to understand how to fix the failure.
-       *
        * For example: "Terms of service not accepted".
        * </pre>
        *
@@ -995,7 +1034,6 @@ public java.lang.String getDescription() {
        * <pre>
        * A description of how the precondition failed. Developers can use this
        * description to understand how to fix the failure.
-       *
        * For example: "Terms of service not accepted".
        * </pre>
        *
@@ -1020,7 +1058,6 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
        * <pre>
        * A description of how the precondition failed. Developers can use this
        * description to understand how to fix the failure.
-       *
        * For example: "Terms of service not accepted".
        * </pre>
        *
@@ -1044,7 +1081,6 @@ public Builder setDescription(java.lang.String value) {
        * <pre>
        * A description of how the precondition failed. Developers can use this
        * description to understand how to fix the failure.
-       *
        * For example: "Terms of service not accepted".
        * </pre>
        *
@@ -1064,7 +1100,6 @@ public Builder clearDescription() {
        * <pre>
        * A description of how the precondition failed. Developers can use this
        * description to understand how to fix the failure.
-       *
        * For example: "Terms of service not accepted".
        * </pre>
        *
@@ -1383,7 +1418,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Describes what preconditions have failed.
-   *
    * For example, if an RPC failed because it required the Terms of Service to be
    * acknowledged, it could list the terms of service violation in the
    * PreconditionFailure message.
@@ -1478,6 +1512,39 @@ private void buildPartial0(com.google.rpc.PreconditionFailure result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.PreconditionFailure) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
index 5fcd0c555d..5b9a09d8e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
@@ -23,14 +23,12 @@
  *
  * <pre>
  * Describes how a quota check failed.
- *
  * For example if a daily limit was exceeded for the calling project,
  * a service could respond with a QuotaFailure detail containing the project
  * id and the description of the quota limit that was exceeded.  If the
  * calling project hasn't enabled the service in the developer console, then
  * a service could respond with the project id and set `service_disabled`
  * to true.
- *
  * Also see RetryInfo and Help types for other details about handling a
  * quota failure.
  * </pre>
@@ -57,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new QuotaFailure();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_descriptor;
   }
@@ -112,7 +115,6 @@ public interface ViolationOrBuilder
      * description to find more about the quota configuration in the service's
      * public documentation, or find the relevant quota limit to adjust through
      * developer console.
-     *
      * For example: "Service disabled" or "Daily Limit for read operations
      * exceeded".
      * </pre>
@@ -130,7 +132,6 @@ public interface ViolationOrBuilder
      * description to find more about the quota configuration in the service's
      * public documentation, or find the relevant quota limit to adjust through
      * developer console.
-     *
      * For example: "Service disabled" or "Daily Limit for read operations
      * exceeded".
      * </pre>
@@ -172,6 +173,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Violation();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto
           .internal_static_google_rpc_QuotaFailure_Violation_descriptor;
@@ -254,7 +260,6 @@ public com.google.protobuf.ByteString getSubjectBytes() {
      * description to find more about the quota configuration in the service's
      * public documentation, or find the relevant quota limit to adjust through
      * developer console.
-     *
      * For example: "Service disabled" or "Daily Limit for read operations
      * exceeded".
      * </pre>
@@ -283,7 +288,6 @@ public java.lang.String getDescription() {
      * description to find more about the quota configuration in the service's
      * public documentation, or find the relevant quota limit to adjust through
      * developer console.
-     *
      * For example: "Service disabled" or "Daily Limit for read operations
      * exceeded".
      * </pre>
@@ -560,6 +564,41 @@ private void buildPartial0(com.google.rpc.QuotaFailure.Violation result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.QuotaFailure.Violation) {
@@ -764,7 +803,6 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
        * description to find more about the quota configuration in the service's
        * public documentation, or find the relevant quota limit to adjust through
        * developer console.
-       *
        * For example: "Service disabled" or "Daily Limit for read operations
        * exceeded".
        * </pre>
@@ -792,7 +830,6 @@ public java.lang.String getDescription() {
        * description to find more about the quota configuration in the service's
        * public documentation, or find the relevant quota limit to adjust through
        * developer console.
-       *
        * For example: "Service disabled" or "Daily Limit for read operations
        * exceeded".
        * </pre>
@@ -820,7 +857,6 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
        * description to find more about the quota configuration in the service's
        * public documentation, or find the relevant quota limit to adjust through
        * developer console.
-       *
        * For example: "Service disabled" or "Daily Limit for read operations
        * exceeded".
        * </pre>
@@ -847,7 +883,6 @@ public Builder setDescription(java.lang.String value) {
        * description to find more about the quota configuration in the service's
        * public documentation, or find the relevant quota limit to adjust through
        * developer console.
-       *
        * For example: "Service disabled" or "Daily Limit for read operations
        * exceeded".
        * </pre>
@@ -870,7 +905,6 @@ public Builder clearDescription() {
        * description to find more about the quota configuration in the service's
        * public documentation, or find the relevant quota limit to adjust through
        * developer console.
-       *
        * For example: "Service disabled" or "Daily Limit for read operations
        * exceeded".
        * </pre>
@@ -1190,14 +1224,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Describes how a quota check failed.
-   *
    * For example if a daily limit was exceeded for the calling project,
    * a service could respond with a QuotaFailure detail containing the project
    * id and the description of the quota limit that was exceeded.  If the
    * calling project hasn't enabled the service in the developer console, then
    * a service could respond with the project id and set `service_disabled`
    * to true.
-   *
    * Also see RetryInfo and Help types for other details about handling a
    * quota failure.
    * </pre>
@@ -1288,6 +1320,39 @@ private void buildPartial0(com.google.rpc.QuotaFailure result) {
       int from_bitField0_ = bitField0_;
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.QuotaFailure) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
index 53d4e17221..74a95775da 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RequestInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_descriptor;
   }
@@ -416,6 +421,39 @@ private void buildPartial0(com.google.rpc.RequestInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.RequestInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
index faaaffad88..ae4be5457a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
@@ -50,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResourceInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_descriptor;
   }
@@ -558,6 +563,39 @@ private void buildPartial0(com.google.rpc.ResourceInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.ResourceInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
index 8800a05806..51e56791ad 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
@@ -25,10 +25,8 @@
  * Describes when the clients can retry a failed request. Clients could ignore
  * the recommendation here or retry when this information is missing from error
  * responses.
- *
  * It's always recommended that clients should use exponential backoff when
  * retrying.
- *
  * Clients should wait until `retry_delay` amount of time has passed since
  * receiving the error response before retrying.  If retrying requests also
  * fail, clients should use an exponential backoff scheme to gradually increase
@@ -57,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RetryInfo();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_descriptor;
   }
@@ -284,10 +287,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Describes when the clients can retry a failed request. Clients could ignore
    * the recommendation here or retry when this information is missing from error
    * responses.
-   *
    * It's always recommended that clients should use exponential backoff when
    * retrying.
-   *
    * Clients should wait until `retry_delay` amount of time has passed since
    * receiving the error response before retrying.  If retrying requests also
    * fail, clients should use an exponential backoff scheme to gradually increase
@@ -370,6 +371,39 @@ private void buildPartial0(com.google.rpc.RetryInfo result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.RetryInfo) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
index f4df267ef7..44168247e2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
@@ -26,7 +26,6 @@
  * different programming environments, including REST APIs and RPC APIs. It is
  * used by [gRPC](https://github.com/grpc). Each `Status` message contains
  * three pieces of data: error code, error message, and error details.
- *
  * You can find out more about this error model and how to work with it in the
  * [API Design Guide](https://cloud.google.com/apis/design/errors).
  * </pre>
@@ -54,6 +53,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Status();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.StatusProto.internal_static_google_rpc_Status_descriptor;
   }
@@ -402,7 +406,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * different programming environments, including REST APIs and RPC APIs. It is
    * used by [gRPC](https://github.com/grpc). Each `Status` message contains
    * three pieces of data: error code, error message, and error details.
-   *
    * You can find out more about this error model and how to work with it in the
    * [API Design Guide](https://cloud.google.com/apis/design/errors).
    * </pre>
@@ -500,6 +503,39 @@ private void buildPartial0(com.google.rpc.Status result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.Status) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java
index 456b9e72e5..1a0db34e7f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java
@@ -23,19 +23,15 @@
  *
  * <pre>
  * This message defines the standard attribute vocabulary for Google APIs.
- *
  * An attribute is a piece of metadata that describes an activity on a network
  * service. For example, the size of an HTTP request, or the status code of
  * an HTTP response.
- *
  * Each attribute has a type and a name, which is logically defined as
  * a proto message field in `AttributeContext`. The field type becomes the
  * attribute type, and the field path becomes the attribute name. For example,
  * the attribute `source.ip` maps to field `AttributeContext.source.ip`.
- *
  * This message definition is guaranteed not to have any wire breaking change.
  * So you can use it directly for passing attributes across different systems.
- *
  * NOTE: Different system may generate different subset of attributes. Please
  * verify the system specification before relying on an attribute generated
  * a system.
@@ -63,6 +59,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AttributeContext();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.context.AttributeContextProto
         .internal_static_google_rpc_context_AttributeContext_descriptor;
@@ -271,6 +272,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Peer();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Peer_descriptor;
@@ -904,6 +910,41 @@ private void buildPartial0(com.google.rpc.context.AttributeContext.Peer result)
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.context.AttributeContext.Peer) {
@@ -1786,6 +1827,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Api();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Api_descriptor;
@@ -2300,6 +2346,41 @@ private void buildPartial0(com.google.rpc.context.AttributeContext.Api result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.context.AttributeContext.Api) {
@@ -2965,14 +3046,12 @@ public interface AuthOrBuilder
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -2990,14 +3069,12 @@ public interface AuthOrBuilder
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3015,14 +3092,12 @@ public interface AuthOrBuilder
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3041,14 +3116,12 @@ public interface AuthOrBuilder
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3099,7 +3172,6 @@ public interface AuthOrBuilder
      * `{key: value}` pairs for standard and private claims. The following
      * is a subset of the standard required and optional claims that would
      * typically be presented for a Google-based JWT:
-     *
      *    {'iss': 'accounts.google.com',
      *     'sub': '113289723416554971153',
      *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -3107,7 +3179,6 @@ public interface AuthOrBuilder
      *     'email': 'jsmith&#64;example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * </pre>
@@ -3125,7 +3196,6 @@ public interface AuthOrBuilder
      * `{key: value}` pairs for standard and private claims. The following
      * is a subset of the standard required and optional claims that would
      * typically be presented for a Google-based JWT:
-     *
      *    {'iss': 'accounts.google.com',
      *     'sub': '113289723416554971153',
      *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -3133,7 +3203,6 @@ public interface AuthOrBuilder
      *     'email': 'jsmith&#64;example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * </pre>
@@ -3151,7 +3220,6 @@ public interface AuthOrBuilder
      * `{key: value}` pairs for standard and private claims. The following
      * is a subset of the standard required and optional claims that would
      * typically be presented for a Google-based JWT:
-     *
      *    {'iss': 'accounts.google.com',
      *     'sub': '113289723416554971153',
      *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -3159,7 +3227,6 @@ public interface AuthOrBuilder
      *     'email': 'jsmith&#64;example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * </pre>
@@ -3176,7 +3243,6 @@ public interface AuthOrBuilder
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3194,7 +3260,6 @@ public interface AuthOrBuilder
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3212,7 +3277,6 @@ public interface AuthOrBuilder
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3231,7 +3295,6 @@ public interface AuthOrBuilder
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3266,9 +3329,9 @@ private Auth(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
 
     private Auth() {
       principal_ = "";
-      audiences_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       presenter_ = "";
-      accessLevels_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -3277,6 +3340,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Auth();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Auth_descriptor;
@@ -3354,8 +3422,7 @@ public com.google.protobuf.ByteString getPrincipalBytes() {
     public static final int AUDIENCES_FIELD_NUMBER = 2;
 
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList audiences_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList audiences_;
     /**
      *
      *
@@ -3364,14 +3431,12 @@ public com.google.protobuf.ByteString getPrincipalBytes() {
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3391,14 +3456,12 @@ public com.google.protobuf.ProtocolStringList getAudiencesList() {
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3418,14 +3481,12 @@ public int getAudiencesCount() {
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3446,14 +3507,12 @@ public java.lang.String getAudiences(int index) {
      * the audience (`aud`) claim within a JWT. The audience
      * value(s) depends on the `issuer`, but typically include one or more of
      * the following pieces of information:
-     *
      * *  The services intended to receive the credential. For example,
      *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
      * *  A set of service-based scopes. For example,
      *    ["https://www.googleapis.com/auth/cloud-platform"].
      * *  The client id of an app, such as the Firebase project id for JWTs
      *    from Firebase Auth.
-     *
      * Consult the documentation for the credential issuer to determine the
      * information provided.
      * </pre>
@@ -3534,7 +3593,6 @@ public com.google.protobuf.ByteString getPresenterBytes() {
      * `{key: value}` pairs for standard and private claims. The following
      * is a subset of the standard required and optional claims that would
      * typically be presented for a Google-based JWT:
-     *
      *    {'iss': 'accounts.google.com',
      *     'sub': '113289723416554971153',
      *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -3542,7 +3600,6 @@ public com.google.protobuf.ByteString getPresenterBytes() {
      *     'email': 'jsmith&#64;example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * </pre>
@@ -3563,7 +3620,6 @@ public boolean hasClaims() {
      * `{key: value}` pairs for standard and private claims. The following
      * is a subset of the standard required and optional claims that would
      * typically be presented for a Google-based JWT:
-     *
      *    {'iss': 'accounts.google.com',
      *     'sub': '113289723416554971153',
      *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -3571,7 +3627,6 @@ public boolean hasClaims() {
      *     'email': 'jsmith&#64;example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * </pre>
@@ -3592,7 +3647,6 @@ public com.google.protobuf.Struct getClaims() {
      * `{key: value}` pairs for standard and private claims. The following
      * is a subset of the standard required and optional claims that would
      * typically be presented for a Google-based JWT:
-     *
      *    {'iss': 'accounts.google.com',
      *     'sub': '113289723416554971153',
      *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -3600,7 +3654,6 @@ public com.google.protobuf.Struct getClaims() {
      *     'email': 'jsmith&#64;example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * </pre>
@@ -3615,8 +3668,7 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
     public static final int ACCESS_LEVELS_FIELD_NUMBER = 5;
 
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList accessLevels_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList accessLevels_;
     /**
      *
      *
@@ -3625,7 +3677,6 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3645,7 +3696,6 @@ public com.google.protobuf.ProtocolStringList getAccessLevelsList() {
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3665,7 +3715,6 @@ public int getAccessLevelsCount() {
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3686,7 +3735,6 @@ public java.lang.String getAccessLevels(int index) {
      * accessed by authenticated requester. It is part of Secure GCP processing
      * for the incoming request. An access level string has the format:
      * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-     *
      * Example:
      * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
      * </pre>
@@ -3958,14 +4006,16 @@ public Builder clear() {
         super.clear();
         bitField0_ = 0;
         principal_ = "";
-        audiences_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
         presenter_ = "";
         claims_ = null;
         if (claimsBuilder_ != null) {
           claimsBuilder_.dispose();
           claimsBuilder_ = null;
         }
-        accessLevels_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -3993,6 +4043,7 @@ public com.google.rpc.context.AttributeContext.Auth build() {
       public com.google.rpc.context.AttributeContext.Auth buildPartial() {
         com.google.rpc.context.AttributeContext.Auth result =
             new com.google.rpc.context.AttributeContext.Auth(this);
+        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) {
           buildPartial0(result);
         }
@@ -4000,25 +4051,65 @@ public com.google.rpc.context.AttributeContext.Auth buildPartial() {
         return result;
       }
 
+      private void buildPartialRepeatedFields(com.google.rpc.context.AttributeContext.Auth result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          audiences_ = audiences_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.audiences_ = audiences_;
+        if (((bitField0_ & 0x00000010) != 0)) {
+          accessLevels_ = accessLevels_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000010);
+        }
+        result.accessLevels_ = accessLevels_;
+      }
+
       private void buildPartial0(com.google.rpc.context.AttributeContext.Auth result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.principal_ = principal_;
         }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          audiences_.makeImmutable();
-          result.audiences_ = audiences_;
-        }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.presenter_ = presenter_;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.claims_ = claimsBuilder_ == null ? claims_ : claimsBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          accessLevels_.makeImmutable();
-          result.accessLevels_ = accessLevels_;
-        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -4041,7 +4132,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
         if (!other.audiences_.isEmpty()) {
           if (audiences_.isEmpty()) {
             audiences_ = other.audiences_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureAudiencesIsMutable();
             audiences_.addAll(other.audiences_);
@@ -4059,7 +4150,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
         if (!other.accessLevels_.isEmpty()) {
           if (accessLevels_.isEmpty()) {
             accessLevels_ = other.accessLevels_;
-            bitField0_ |= 0x00000010;
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureAccessLevelsIsMutable();
             accessLevels_.addAll(other.accessLevels_);
@@ -4269,14 +4360,14 @@ public Builder setPrincipalBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList audiences_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      private com.google.protobuf.LazyStringList audiences_ =
+          com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureAudiencesIsMutable() {
-        if (!audiences_.isModifiable()) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           audiences_ = new com.google.protobuf.LazyStringArrayList(audiences_);
+          bitField0_ |= 0x00000002;
         }
-        bitField0_ |= 0x00000002;
       }
       /**
        *
@@ -4286,14 +4377,12 @@ private void ensureAudiencesIsMutable() {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4303,8 +4392,7 @@ private void ensureAudiencesIsMutable() {
        * @return A list containing the audiences.
        */
       public com.google.protobuf.ProtocolStringList getAudiencesList() {
-        audiences_.makeImmutable();
-        return audiences_;
+        return audiences_.getUnmodifiableView();
       }
       /**
        *
@@ -4314,14 +4402,12 @@ public com.google.protobuf.ProtocolStringList getAudiencesList() {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4341,14 +4427,12 @@ public int getAudiencesCount() {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4369,14 +4453,12 @@ public java.lang.String getAudiences(int index) {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4397,14 +4479,12 @@ public com.google.protobuf.ByteString getAudiencesBytes(int index) {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4421,7 +4501,6 @@ public Builder setAudiences(int index, java.lang.String value) {
         }
         ensureAudiencesIsMutable();
         audiences_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4433,14 +4512,12 @@ public Builder setAudiences(int index, java.lang.String value) {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4456,7 +4533,6 @@ public Builder addAudiences(java.lang.String value) {
         }
         ensureAudiencesIsMutable();
         audiences_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4468,14 +4544,12 @@ public Builder addAudiences(java.lang.String value) {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4488,7 +4562,6 @@ public Builder addAudiences(java.lang.String value) {
       public Builder addAllAudiences(java.lang.Iterable<java.lang.String> values) {
         ensureAudiencesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, audiences_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4500,14 +4573,12 @@ public Builder addAllAudiences(java.lang.Iterable<java.lang.String> values) {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4517,9 +4588,8 @@ public Builder addAllAudiences(java.lang.Iterable<java.lang.String> values) {
        * @return This builder for chaining.
        */
       public Builder clearAudiences() {
-        audiences_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        ;
         onChanged();
         return this;
       }
@@ -4531,14 +4601,12 @@ public Builder clearAudiences() {
        * the audience (`aud`) claim within a JWT. The audience
        * value(s) depends on the `issuer`, but typically include one or more of
        * the following pieces of information:
-       *
        * *  The services intended to receive the credential. For example,
        *    ["https://pubsub.googleapis.com/", "https://storage.googleapis.com/"].
        * *  A set of service-based scopes. For example,
        *    ["https://www.googleapis.com/auth/cloud-platform"].
        * *  The client id of an app, such as the Firebase project id for JWTs
        *    from Firebase Auth.
-       *
        * Consult the documentation for the credential issuer to determine the
        * information provided.
        * </pre>
@@ -4555,7 +4623,6 @@ public Builder addAudiencesBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureAudiencesIsMutable();
         audiences_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4695,7 +4762,6 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4703,7 +4769,6 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4723,7 +4788,6 @@ public boolean hasClaims() {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4731,7 +4795,6 @@ public boolean hasClaims() {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4755,7 +4818,6 @@ public com.google.protobuf.Struct getClaims() {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4763,7 +4825,6 @@ public com.google.protobuf.Struct getClaims() {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4791,7 +4852,6 @@ public Builder setClaims(com.google.protobuf.Struct value) {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4799,7 +4859,6 @@ public Builder setClaims(com.google.protobuf.Struct value) {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4824,7 +4883,6 @@ public Builder setClaims(com.google.protobuf.Struct.Builder builderForValue) {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4832,7 +4890,6 @@ public Builder setClaims(com.google.protobuf.Struct.Builder builderForValue) {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4863,7 +4920,6 @@ public Builder mergeClaims(com.google.protobuf.Struct value) {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4871,7 +4927,6 @@ public Builder mergeClaims(com.google.protobuf.Struct value) {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4896,7 +4951,6 @@ public Builder clearClaims() {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4904,7 +4958,6 @@ public Builder clearClaims() {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4924,7 +4977,6 @@ public com.google.protobuf.Struct.Builder getClaimsBuilder() {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4932,7 +4984,6 @@ public com.google.protobuf.Struct.Builder getClaimsBuilder() {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4954,7 +5005,6 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
        * `{key: value}` pairs for standard and private claims. The following
        * is a subset of the standard required and optional claims that would
        * typically be presented for a Google-based JWT:
-       *
        *    {'iss': 'accounts.google.com',
        *     'sub': '113289723416554971153',
        *     'aud': ['123456789012', 'pubsub.googleapis.com'],
@@ -4962,7 +5012,6 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
        *     'email': 'jsmith&#64;example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * </pre>
@@ -4986,14 +5035,14 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
         return claimsBuilder_;
       }
 
-      private com.google.protobuf.LazyStringArrayList accessLevels_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      private com.google.protobuf.LazyStringList accessLevels_ =
+          com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureAccessLevelsIsMutable() {
-        if (!accessLevels_.isModifiable()) {
+        if (!((bitField0_ & 0x00000010) != 0)) {
           accessLevels_ = new com.google.protobuf.LazyStringArrayList(accessLevels_);
+          bitField0_ |= 0x00000010;
         }
-        bitField0_ |= 0x00000010;
       }
       /**
        *
@@ -5003,7 +5052,6 @@ private void ensureAccessLevelsIsMutable() {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5013,8 +5061,7 @@ private void ensureAccessLevelsIsMutable() {
        * @return A list containing the accessLevels.
        */
       public com.google.protobuf.ProtocolStringList getAccessLevelsList() {
-        accessLevels_.makeImmutable();
-        return accessLevels_;
+        return accessLevels_.getUnmodifiableView();
       }
       /**
        *
@@ -5024,7 +5071,6 @@ public com.google.protobuf.ProtocolStringList getAccessLevelsList() {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5044,7 +5090,6 @@ public int getAccessLevelsCount() {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5065,7 +5110,6 @@ public java.lang.String getAccessLevels(int index) {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5086,7 +5130,6 @@ public com.google.protobuf.ByteString getAccessLevelsBytes(int index) {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5103,7 +5146,6 @@ public Builder setAccessLevels(int index, java.lang.String value) {
         }
         ensureAccessLevelsIsMutable();
         accessLevels_.set(index, value);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5115,7 +5157,6 @@ public Builder setAccessLevels(int index, java.lang.String value) {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5131,7 +5172,6 @@ public Builder addAccessLevels(java.lang.String value) {
         }
         ensureAccessLevelsIsMutable();
         accessLevels_.add(value);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5143,7 +5183,6 @@ public Builder addAccessLevels(java.lang.String value) {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5156,7 +5195,6 @@ public Builder addAccessLevels(java.lang.String value) {
       public Builder addAllAccessLevels(java.lang.Iterable<java.lang.String> values) {
         ensureAccessLevelsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, accessLevels_);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5168,7 +5206,6 @@ public Builder addAllAccessLevels(java.lang.Iterable<java.lang.String> values) {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5178,9 +5215,8 @@ public Builder addAllAccessLevels(java.lang.Iterable<java.lang.String> values) {
        * @return This builder for chaining.
        */
       public Builder clearAccessLevels() {
-        accessLevels_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000010);
-        ;
         onChanged();
         return this;
       }
@@ -5192,7 +5228,6 @@ public Builder clearAccessLevels() {
        * accessed by authenticated requester. It is part of Secure GCP processing
        * for the incoming request. An access level string has the format:
        * "//{api_service_name}/accessPolicies/{policy_id}/accessLevels/{short_name}"
-       *
        * Example:
        * "//accesscontextmanager.googleapis.com/accessPolicies/MY_POLICY_ID/accessLevels/MY_LEVEL"
        * </pre>
@@ -5209,7 +5244,6 @@ public Builder addAccessLevelsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureAccessLevelsIsMutable();
         accessLevels_.add(value);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5692,6 +5726,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Request();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Request_descriptor;
@@ -6804,6 +6843,41 @@ private void buildPartial0(com.google.rpc.context.AttributeContext.Request resul
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.context.AttributeContext.Request) {
@@ -8759,6 +8833,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Response();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Response_descriptor;
@@ -9382,6 +9461,41 @@ private void buildPartial0(com.google.rpc.context.AttributeContext.Response resu
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.context.AttributeContext.Response) {
@@ -10279,14 +10393,12 @@ public interface ResourceOrBuilder
      * The stable identifier (name) of a resource on the `service`. A resource
      * can be logically identified as "//{resource.service}/{resource.name}".
      * The differences between a resource name and a URI are:
-     *
      * *   Resource name is a logical identifier, independent of network
      *     protocol and API version. For example,
      *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
      * *   URI often includes protocol and version information, so it can
      *     be used directly by applications. For example,
      *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-     *
      * See https://cloud.google.com/apis/design/resource_names for details.
      * </pre>
      *
@@ -10302,14 +10414,12 @@ public interface ResourceOrBuilder
      * The stable identifier (name) of a resource on the `service`. A resource
      * can be logically identified as "//{resource.service}/{resource.name}".
      * The differences between a resource name and a URI are:
-     *
      * *   Resource name is a logical identifier, independent of network
      *     protocol and API version. For example,
      *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
      * *   URI often includes protocol and version information, so it can
      *     be used directly by applications. For example,
      *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-     *
      * See https://cloud.google.com/apis/design/resource_names for details.
      * </pre>
      *
@@ -10325,7 +10435,6 @@ public interface ResourceOrBuilder
      * <pre>
      * The type of the resource. The syntax is platform-specific because
      * different platforms define their resources differently.
-     *
      * For Google APIs, the type format must be "{service}/{kind}", such as
      * "pubsub.googleapis.com/Topic".
      * </pre>
@@ -10341,7 +10450,6 @@ public interface ResourceOrBuilder
      * <pre>
      * The type of the resource. The syntax is platform-specific because
      * different platforms define their resources differently.
-     *
      * For Google APIs, the type format must be "{service}/{kind}", such as
      * "pubsub.googleapis.com/Topic".
      * </pre>
@@ -10455,7 +10563,6 @@ java.lang.String getLabelsOrDefault(
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -10469,7 +10576,6 @@ java.lang.String getLabelsOrDefault(
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -10486,7 +10592,6 @@ java.lang.String getLabelsOrDefault(
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -10500,7 +10605,6 @@ java.lang.String getLabelsOrDefault(
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -10518,7 +10622,6 @@ java.lang.String getAnnotationsOrDefault(
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -10704,7 +10807,6 @@ java.lang.String getAnnotationsOrDefault(
      * Immutable. The location of the resource. The location encoding is
      * specific to the service provider, and new encoding may be introduced
      * as the service evolves.
-     *
      * For Google Cloud products, the encoding is what is used by Google Cloud
      * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
      * semantics of `location` is identical to the
@@ -10723,7 +10825,6 @@ java.lang.String getAnnotationsOrDefault(
      * Immutable. The location of the resource. The location encoding is
      * specific to the service provider, and new encoding may be introduced
      * as the service evolves.
-     *
      * For Google Cloud products, the encoding is what is used by Google Cloud
      * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
      * semantics of `location` is identical to the
@@ -10773,6 +10874,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Resource();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Resource_descriptor;
@@ -10867,14 +10973,12 @@ public com.google.protobuf.ByteString getServiceBytes() {
      * The stable identifier (name) of a resource on the `service`. A resource
      * can be logically identified as "//{resource.service}/{resource.name}".
      * The differences between a resource name and a URI are:
-     *
      * *   Resource name is a logical identifier, independent of network
      *     protocol and API version. For example,
      *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
      * *   URI often includes protocol and version information, so it can
      *     be used directly by applications. For example,
      *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-     *
      * See https://cloud.google.com/apis/design/resource_names for details.
      * </pre>
      *
@@ -10901,14 +11005,12 @@ public java.lang.String getName() {
      * The stable identifier (name) of a resource on the `service`. A resource
      * can be logically identified as "//{resource.service}/{resource.name}".
      * The differences between a resource name and a URI are:
-     *
      * *   Resource name is a logical identifier, independent of network
      *     protocol and API version. For example,
      *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
      * *   URI often includes protocol and version information, so it can
      *     be used directly by applications. For example,
      *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-     *
      * See https://cloud.google.com/apis/design/resource_names for details.
      * </pre>
      *
@@ -10939,7 +11041,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      * <pre>
      * The type of the resource. The syntax is platform-specific because
      * different platforms define their resources differently.
-     *
      * For Google APIs, the type format must be "{service}/{kind}", such as
      * "pubsub.googleapis.com/Topic".
      * </pre>
@@ -10966,7 +11067,6 @@ public java.lang.String getType() {
      * <pre>
      * The type of the resource. The syntax is platform-specific because
      * different platforms define their resources differently.
-     *
      * For Google APIs, the type format must be "{service}/{kind}", such as
      * "pubsub.googleapis.com/Topic".
      * </pre>
@@ -11188,7 +11288,6 @@ public int getAnnotationsCount() {
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -11214,7 +11313,6 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotations() {
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -11231,7 +11329,6 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotationsMap() {
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -11255,7 +11352,6 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotationsMap() {
      * Annotations is an unstructured key-value map stored with a resource that
      * may be set by external tools to store and retrieve arbitrary metadata.
      * They are not queryable and should be preserved when modifying objects.
-     *
      * More info: https://kubernetes.io/docs/user-guide/annotations
      * </pre>
      *
@@ -11540,7 +11636,6 @@ public com.google.protobuf.ByteString getEtagBytes() {
      * Immutable. The location of the resource. The location encoding is
      * specific to the service provider, and new encoding may be introduced
      * as the service evolves.
-     *
      * For Google Cloud products, the encoding is what is used by Google Cloud
      * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
      * semantics of `location` is identical to the
@@ -11570,7 +11665,6 @@ public java.lang.String getLocation() {
      * Immutable. The location of the resource. The location encoding is
      * specific to the service provider, and new encoding may be introduced
      * as the service evolves.
-     *
      * For Google Cloud products, the encoding is what is used by Google Cloud
      * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
      * semantics of `location` is identical to the
@@ -12053,6 +12147,41 @@ private void buildPartial0(com.google.rpc.context.AttributeContext.Resource resu
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.rpc.context.AttributeContext.Resource) {
@@ -12367,14 +12496,12 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
        * The stable identifier (name) of a resource on the `service`. A resource
        * can be logically identified as "//{resource.service}/{resource.name}".
        * The differences between a resource name and a URI are:
-       *
        * *   Resource name is a logical identifier, independent of network
        *     protocol and API version. For example,
        *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
        * *   URI often includes protocol and version information, so it can
        *     be used directly by applications. For example,
        *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-       *
        * See https://cloud.google.com/apis/design/resource_names for details.
        * </pre>
        *
@@ -12400,14 +12527,12 @@ public java.lang.String getName() {
        * The stable identifier (name) of a resource on the `service`. A resource
        * can be logically identified as "//{resource.service}/{resource.name}".
        * The differences between a resource name and a URI are:
-       *
        * *   Resource name is a logical identifier, independent of network
        *     protocol and API version. For example,
        *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
        * *   URI often includes protocol and version information, so it can
        *     be used directly by applications. For example,
        *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-       *
        * See https://cloud.google.com/apis/design/resource_names for details.
        * </pre>
        *
@@ -12433,14 +12558,12 @@ public com.google.protobuf.ByteString getNameBytes() {
        * The stable identifier (name) of a resource on the `service`. A resource
        * can be logically identified as "//{resource.service}/{resource.name}".
        * The differences between a resource name and a URI are:
-       *
        * *   Resource name is a logical identifier, independent of network
        *     protocol and API version. For example,
        *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
        * *   URI often includes protocol and version information, so it can
        *     be used directly by applications. For example,
        *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-       *
        * See https://cloud.google.com/apis/design/resource_names for details.
        * </pre>
        *
@@ -12465,14 +12588,12 @@ public Builder setName(java.lang.String value) {
        * The stable identifier (name) of a resource on the `service`. A resource
        * can be logically identified as "//{resource.service}/{resource.name}".
        * The differences between a resource name and a URI are:
-       *
        * *   Resource name is a logical identifier, independent of network
        *     protocol and API version. For example,
        *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
        * *   URI often includes protocol and version information, so it can
        *     be used directly by applications. For example,
        *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-       *
        * See https://cloud.google.com/apis/design/resource_names for details.
        * </pre>
        *
@@ -12493,14 +12614,12 @@ public Builder clearName() {
        * The stable identifier (name) of a resource on the `service`. A resource
        * can be logically identified as "//{resource.service}/{resource.name}".
        * The differences between a resource name and a URI are:
-       *
        * *   Resource name is a logical identifier, independent of network
        *     protocol and API version. For example,
        *     `//pubsub.googleapis.com/projects/123/topics/news-feed`.
        * *   URI often includes protocol and version information, so it can
        *     be used directly by applications. For example,
        *     `https://pubsub.googleapis.com/v1/projects/123/topics/news-feed`.
-       *
        * See https://cloud.google.com/apis/design/resource_names for details.
        * </pre>
        *
@@ -12527,7 +12646,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
        * <pre>
        * The type of the resource. The syntax is platform-specific because
        * different platforms define their resources differently.
-       *
        * For Google APIs, the type format must be "{service}/{kind}", such as
        * "pubsub.googleapis.com/Topic".
        * </pre>
@@ -12553,7 +12671,6 @@ public java.lang.String getType() {
        * <pre>
        * The type of the resource. The syntax is platform-specific because
        * different platforms define their resources differently.
-       *
        * For Google APIs, the type format must be "{service}/{kind}", such as
        * "pubsub.googleapis.com/Topic".
        * </pre>
@@ -12579,7 +12696,6 @@ public com.google.protobuf.ByteString getTypeBytes() {
        * <pre>
        * The type of the resource. The syntax is platform-specific because
        * different platforms define their resources differently.
-       *
        * For Google APIs, the type format must be "{service}/{kind}", such as
        * "pubsub.googleapis.com/Topic".
        * </pre>
@@ -12604,7 +12720,6 @@ public Builder setType(java.lang.String value) {
        * <pre>
        * The type of the resource. The syntax is platform-specific because
        * different platforms define their resources differently.
-       *
        * For Google APIs, the type format must be "{service}/{kind}", such as
        * "pubsub.googleapis.com/Topic".
        * </pre>
@@ -12625,7 +12740,6 @@ public Builder clearType() {
        * <pre>
        * The type of the resource. The syntax is platform-specific because
        * different platforms define their resources differently.
-       *
        * For Google APIs, the type format must be "{service}/{kind}", such as
        * "pubsub.googleapis.com/Topic".
        * </pre>
@@ -12977,7 +13091,6 @@ public int getAnnotationsCount() {
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13003,7 +13116,6 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotations() {
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13020,7 +13132,6 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotationsMap() {
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13044,7 +13155,6 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotationsMap() {
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13074,7 +13184,6 @@ public Builder clearAnnotations() {
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13100,7 +13209,6 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableAnnotations()
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13124,7 +13232,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
        * Annotations is an unstructured key-value map stored with a resource that
        * may be set by external tools to store and retrieve arbitrary metadata.
        * They are not queryable and should be preserved when modifying objects.
-       *
        * More info: https://kubernetes.io/docs/user-guide/annotations
        * </pre>
        *
@@ -13951,7 +14058,6 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
        * Immutable. The location of the resource. The location encoding is
        * specific to the service provider, and new encoding may be introduced
        * as the service evolves.
-       *
        * For Google Cloud products, the encoding is what is used by Google Cloud
        * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
        * semantics of `location` is identical to the
@@ -13980,7 +14086,6 @@ public java.lang.String getLocation() {
        * Immutable. The location of the resource. The location encoding is
        * specific to the service provider, and new encoding may be introduced
        * as the service evolves.
-       *
        * For Google Cloud products, the encoding is what is used by Google Cloud
        * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
        * semantics of `location` is identical to the
@@ -14009,7 +14114,6 @@ public com.google.protobuf.ByteString getLocationBytes() {
        * Immutable. The location of the resource. The location encoding is
        * specific to the service provider, and new encoding may be introduced
        * as the service evolves.
-       *
        * For Google Cloud products, the encoding is what is used by Google Cloud
        * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
        * semantics of `location` is identical to the
@@ -14037,7 +14141,6 @@ public Builder setLocation(java.lang.String value) {
        * Immutable. The location of the resource. The location encoding is
        * specific to the service provider, and new encoding may be introduced
        * as the service evolves.
-       *
        * For Google Cloud products, the encoding is what is used by Google Cloud
        * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
        * semantics of `location` is identical to the
@@ -14061,7 +14164,6 @@ public Builder clearLocation() {
        * Immutable. The location of the resource. The location encoding is
        * specific to the service provider, and new encoding may be introduced
        * as the service evolves.
-       *
        * For Google Cloud products, the encoding is what is used by Google Cloud
        * APIs, such as `us-east1`, `aws-us-east-1`, and `azure-eastus2`. The
        * semantics of `location` is identical to the
@@ -14851,19 +14953,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * This message defines the standard attribute vocabulary for Google APIs.
-   *
    * An attribute is a piece of metadata that describes an activity on a network
    * service. For example, the size of an HTTP request, or the status code of
    * an HTTP response.
-   *
    * Each attribute has a type and a name, which is logically defined as
    * a proto message field in `AttributeContext`. The field type becomes the
    * attribute type, and the field path becomes the attribute name. For example,
    * the attribute `source.ip` maps to field `AttributeContext.source.ip`.
-   *
    * This message definition is guaranteed not to have any wire breaking change.
    * So you can use it directly for passing attributes across different systems.
-   *
    * NOTE: Different system may generate different subset of attributes. Please
    * verify the system specification before relying on an attribute generated
    * a system.
@@ -15016,6 +15114,39 @@ private void buildPartial0(com.google.rpc.context.AttributeContext result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.context.AttributeContext) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContext.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContext.java
index 694a0c5b93..c1ad7785a7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContext.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContext.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuditContext();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.context.AuditContextProto
         .internal_static_google_rpc_context_AuditContext_descriptor;
@@ -577,6 +582,39 @@ private void buildPartial0(com.google.rpc.context.AuditContext result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.rpc.context.AuditContext) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Color.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Color.java
index e4d64a640c..291b0ec150 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Color.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Color.java
@@ -29,34 +29,27 @@
  * can also be trivially provided to UIColor's `+colorWithRed:green:blue:alpha`
  * method in iOS; and, with just a little work, it can be easily formatted into
  * a CSS `rgba()` string in JavaScript.
- *
  * This reference page doesn't carry information about the absolute color
  * space
  * that should be used to interpret the RGB value (e.g. sRGB, Adobe RGB,
  * DCI-P3, BT.2020, etc.). By default, applications should assume the sRGB color
  * space.
- *
  * When color equality needs to be decided, implementations, unless
  * documented otherwise, treat two colors as equal if all their red,
  * green, blue, and alpha values each differ by at most 1e-5.
- *
  * Example (Java):
- *
  *      import com.google.type.Color;
- *
  *      // ...
  *      public static java.awt.Color fromProto(Color protocolor) {
  *        float alpha = protocolor.hasAlpha()
  *            ? protocolor.getAlpha().getValue()
  *            : 1.0;
- *
  *        return new java.awt.Color(
  *            protocolor.getRed(),
  *            protocolor.getGreen(),
  *            protocolor.getBlue(),
  *            alpha);
  *      }
- *
  *      public static Color toProto(java.awt.Color color) {
  *        float red = (float) color.getRed();
  *        float green = (float) color.getGreen();
@@ -79,9 +72,7 @@
  *        return resultBuilder.build();
  *      }
  *      // ...
- *
  * Example (iOS / Obj-C):
- *
  *      // ...
  *      static UIColor* fromProto(Color* protocolor) {
  *         float red = [protocolor red];
@@ -94,7 +85,6 @@
  *         }
  *         return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
  *      }
- *
  *      static Color* toProto(UIColor* color) {
  *          CGFloat red, green, blue, alpha;
  *          if (![color getRed:&amp;red green:&amp;green blue:&amp;blue alpha:&amp;alpha]) {
@@ -111,11 +101,8 @@
  *          return result;
  *     }
  *     // ...
- *
  *  Example (JavaScript):
- *
  *     // ...
- *
  *     var protoToCssColor = function(rgb_color) {
  *        var redFrac = rgb_color.red || 0.0;
  *        var greenFrac = rgb_color.green || 0.0;
@@ -123,16 +110,13 @@
  *        var red = Math.floor(redFrac * 255);
  *        var green = Math.floor(greenFrac * 255);
  *        var blue = Math.floor(blueFrac * 255);
- *
  *        if (!('alpha' in rgb_color)) {
  *           return rgbToCssColor(red, green, blue);
  *        }
- *
  *        var alphaFrac = rgb_color.alpha.value || 0.0;
  *        var rgbParams = [red, green, blue].join(',');
  *        return ['rgba(', rgbParams, ',', alphaFrac, ')'].join('');
  *     };
- *
  *     var rgbToCssColor = function(red, green, blue) {
  *       var rgbNumber = new Number((red &lt;&lt; 16) | (green &lt;&lt; 8) | blue);
  *       var hexString = rgbNumber.toString(16);
@@ -144,7 +128,6 @@
  *       resultBuilder.push(hexString);
  *       return resultBuilder.join('');
  *     };
- *
  *     // ...
  * </pre>
  *
@@ -168,6 +151,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Color();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.ColorProto.internal_static_google_type_Color_descriptor;
   }
@@ -242,9 +230,7 @@ public float getBlue() {
    * <pre>
    * The fraction of this color that should be applied to the pixel. That is,
    * the final pixel color is defined by the equation:
-   *
    *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-   *
    * This means that a value of 1.0 corresponds to a solid color, whereas
    * a value of 0.0 corresponds to a completely transparent color. This
    * uses a wrapper message rather than a simple float scalar so that it is
@@ -267,9 +253,7 @@ public boolean hasAlpha() {
    * <pre>
    * The fraction of this color that should be applied to the pixel. That is,
    * the final pixel color is defined by the equation:
-   *
    *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-   *
    * This means that a value of 1.0 corresponds to a solid color, whereas
    * a value of 0.0 corresponds to a completely transparent color. This
    * uses a wrapper message rather than a simple float scalar so that it is
@@ -292,9 +276,7 @@ public com.google.protobuf.FloatValue getAlpha() {
    * <pre>
    * The fraction of this color that should be applied to the pixel. That is,
    * the final pixel color is defined by the equation:
-   *
    *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-   *
    * This means that a value of 1.0 corresponds to a solid color, whereas
    * a value of 0.0 corresponds to a completely transparent color. This
    * uses a wrapper message rather than a simple float scalar so that it is
@@ -513,34 +495,27 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * can also be trivially provided to UIColor's `+colorWithRed:green:blue:alpha`
    * method in iOS; and, with just a little work, it can be easily formatted into
    * a CSS `rgba()` string in JavaScript.
-   *
    * This reference page doesn't carry information about the absolute color
    * space
    * that should be used to interpret the RGB value (e.g. sRGB, Adobe RGB,
    * DCI-P3, BT.2020, etc.). By default, applications should assume the sRGB color
    * space.
-   *
    * When color equality needs to be decided, implementations, unless
    * documented otherwise, treat two colors as equal if all their red,
    * green, blue, and alpha values each differ by at most 1e-5.
-   *
    * Example (Java):
-   *
    *      import com.google.type.Color;
-   *
    *      // ...
    *      public static java.awt.Color fromProto(Color protocolor) {
    *        float alpha = protocolor.hasAlpha()
    *            ? protocolor.getAlpha().getValue()
    *            : 1.0;
-   *
    *        return new java.awt.Color(
    *            protocolor.getRed(),
    *            protocolor.getGreen(),
    *            protocolor.getBlue(),
    *            alpha);
    *      }
-   *
    *      public static Color toProto(java.awt.Color color) {
    *        float red = (float) color.getRed();
    *        float green = (float) color.getGreen();
@@ -563,9 +538,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *        return resultBuilder.build();
    *      }
    *      // ...
-   *
    * Example (iOS / Obj-C):
-   *
    *      // ...
    *      static UIColor* fromProto(Color* protocolor) {
    *         float red = [protocolor red];
@@ -578,7 +551,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         }
    *         return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
    *      }
-   *
    *      static Color* toProto(UIColor* color) {
    *          CGFloat red, green, blue, alpha;
    *          if (![color getRed:&amp;red green:&amp;green blue:&amp;blue alpha:&amp;alpha]) {
@@ -595,11 +567,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *          return result;
    *     }
    *     // ...
-   *
    *  Example (JavaScript):
-   *
    *     // ...
-   *
    *     var protoToCssColor = function(rgb_color) {
    *        var redFrac = rgb_color.red || 0.0;
    *        var greenFrac = rgb_color.green || 0.0;
@@ -607,16 +576,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *        var red = Math.floor(redFrac * 255);
    *        var green = Math.floor(greenFrac * 255);
    *        var blue = Math.floor(blueFrac * 255);
-   *
    *        if (!('alpha' in rgb_color)) {
    *           return rgbToCssColor(red, green, blue);
    *        }
-   *
    *        var alphaFrac = rgb_color.alpha.value || 0.0;
    *        var rgbParams = [red, green, blue].join(',');
    *        return ['rgba(', rgbParams, ',', alphaFrac, ')'].join('');
    *     };
-   *
    *     var rgbToCssColor = function(red, green, blue) {
    *       var rgbNumber = new Number((red &lt;&lt; 16) | (green &lt;&lt; 8) | blue);
    *       var hexString = rgbNumber.toString(16);
@@ -628,7 +594,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       resultBuilder.push(hexString);
    *       return resultBuilder.join('');
    *     };
-   *
    *     // ...
    * </pre>
    *
@@ -717,6 +682,39 @@ private void buildPartial0(com.google.type.Color result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Color) {
@@ -981,9 +979,7 @@ public Builder clearBlue() {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1005,9 +1001,7 @@ public boolean hasAlpha() {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1033,9 +1027,7 @@ public com.google.protobuf.FloatValue getAlpha() {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1065,9 +1057,7 @@ public Builder setAlpha(com.google.protobuf.FloatValue value) {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1094,9 +1084,7 @@ public Builder setAlpha(com.google.protobuf.FloatValue.Builder builderForValue)
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1129,9 +1117,7 @@ public Builder mergeAlpha(com.google.protobuf.FloatValue value) {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1158,9 +1144,7 @@ public Builder clearAlpha() {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1182,9 +1166,7 @@ public com.google.protobuf.FloatValue.Builder getAlphaBuilder() {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
@@ -1208,9 +1190,7 @@ public com.google.protobuf.FloatValueOrBuilder getAlphaOrBuilder() {
      * <pre>
      * The fraction of this color that should be applied to the pixel. That is,
      * the final pixel color is defined by the equation:
-     *
      *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-     *
      * This means that a value of 1.0 corresponds to a solid color, whereas
      * a value of 0.0 corresponds to a completely transparent color. This
      * uses a wrapper message rather than a simple float scalar so that it is
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorOrBuilder.java
index eb53a17bb9..f789a85df7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorOrBuilder.java
@@ -68,9 +68,7 @@ public interface ColorOrBuilder
    * <pre>
    * The fraction of this color that should be applied to the pixel. That is,
    * the final pixel color is defined by the equation:
-   *
    *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-   *
    * This means that a value of 1.0 corresponds to a solid color, whereas
    * a value of 0.0 corresponds to a completely transparent color. This
    * uses a wrapper message rather than a simple float scalar so that it is
@@ -90,9 +88,7 @@ public interface ColorOrBuilder
    * <pre>
    * The fraction of this color that should be applied to the pixel. That is,
    * the final pixel color is defined by the equation:
-   *
    *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-   *
    * This means that a value of 1.0 corresponds to a solid color, whereas
    * a value of 0.0 corresponds to a completely transparent color. This
    * uses a wrapper message rather than a simple float scalar so that it is
@@ -112,9 +108,7 @@ public interface ColorOrBuilder
    * <pre>
    * The fraction of this color that should be applied to the pixel. That is,
    * the final pixel color is defined by the equation:
-   *
    *   `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
-   *
    * This means that a value of 1.0 corresponds to a solid color, whereas
    * a value of 0.0 corresponds to a completely transparent color. This
    * uses a wrapper message rather than a simple float scalar so that it is
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Date.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Date.java
index 8ba5148c55..bf46c6f021 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Date.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Date.java
@@ -26,13 +26,11 @@
  * day and time zone are either specified elsewhere or are insignificant. The
  * date is relative to the Gregorian Calendar. This can represent one of the
  * following:
- *
  * * A full date, with non-zero year, month, and day values
  * * A month and day value, with a zero year, such as an anniversary
  * * A year on its own, with zero month and day values
  * * A year and month value, with a zero day, such as a credit card expiration
  * date
- *
  * Related types are [google.type.TimeOfDay][google.type.TimeOfDay] and
  * `google.protobuf.Timestamp`.
  * </pre>
@@ -57,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Date();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DateProto.internal_static_google_type_Date_descriptor;
   }
@@ -310,13 +313,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * day and time zone are either specified elsewhere or are insignificant. The
    * date is relative to the Gregorian Calendar. This can represent one of the
    * following:
-   *
    * * A full date, with non-zero year, month, and day values
    * * A month and day value, with a zero year, such as an anniversary
    * * A year on its own, with zero month and day values
    * * A year and month value, with a zero day, such as a credit card expiration
    * date
-   *
    * Related types are [google.type.TimeOfDay][google.type.TimeOfDay] and
    * `google.protobuf.Timestamp`.
    * </pre>
@@ -398,6 +399,39 @@ private void buildPartial0(com.google.type.Date result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Date) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java
index 8ecc8ef24d..295d91ad96 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java
@@ -23,27 +23,21 @@
  *
  * <pre>
  * Represents civil time (or occasionally physical time).
- *
  * This type can represent a civil time in one of a few possible ways:
- *
  *  * When utc_offset is set and time_zone is unset: a civil time on a calendar
  *    day with a particular offset from UTC.
  *  * When time_zone is set and utc_offset is unset: a civil time on a calendar
  *    day in a particular time zone.
  *  * When neither time_zone nor utc_offset is set: a civil time on a calendar
  *    day in local time.
- *
  * The date is relative to the Proleptic Gregorian Calendar.
- *
  * If year is 0, the DateTime is considered not to have a specific year. month
  * and day must have valid, non-zero values.
- *
  * This type may also be used to represent a physical time if all the date and
  * time fields are set and either case of the `time_offset` oneof is set.
  * Consider using `Timestamp` message for physical time instead. If your use
  * case also would like to store the user's timezone, that can be done in
  * another field.
- *
  * This type is more flexible than some applications may want. Make sure to
  * document and validate your application's limitations.
  * </pre>
@@ -68,6 +62,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DateTime();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DateTimeProto.internal_static_google_type_DateTime_descriptor;
   }
@@ -81,8 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int timeOffsetCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object timeOffset_;
 
   public enum TimeOffsetCase
@@ -624,27 +621,21 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * Represents civil time (or occasionally physical time).
-   *
    * This type can represent a civil time in one of a few possible ways:
-   *
    *  * When utc_offset is set and time_zone is unset: a civil time on a calendar
    *    day with a particular offset from UTC.
    *  * When time_zone is set and utc_offset is unset: a civil time on a calendar
    *    day in a particular time zone.
    *  * When neither time_zone nor utc_offset is set: a civil time on a calendar
    *    day in local time.
-   *
    * The date is relative to the Proleptic Gregorian Calendar.
-   *
    * If year is 0, the DateTime is considered not to have a specific year. month
    * and day must have valid, non-zero values.
-   *
    * This type may also be used to represent a physical time if all the date and
    * time fields are set and either case of the `time_offset` oneof is set.
    * Consider using `Timestamp` message for physical time instead. If your use
    * case also would like to store the user's timezone, that can be done in
    * another field.
-   *
    * This type is more flexible than some applications may want. Make sure to
    * document and validate your application's limitations.
    * </pre>
@@ -762,6 +753,39 @@ private void buildPartialOneofs(com.google.type.DateTime result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.DateTime) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeOrBuilder.java
index 3d237dbb18..fb8329d59c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeOrBuilder.java
@@ -196,5 +196,5 @@ public interface DateTimeOrBuilder
    */
   com.google.type.TimeZoneOrBuilder getTimeZoneOrBuilder();
 
-  com.google.type.DateTime.TimeOffsetCase getTimeOffsetCase();
+  public com.google.type.DateTime.TimeOffsetCase getTimeOffsetCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java
index 3a7ce4b3fb..7cd61f76c7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java
@@ -25,7 +25,6 @@
  * A representation of a decimal value, such as 2.5. Clients may convert values
  * into language-native decimal formats, such as Java's [BigDecimal][] or
  * Python's [decimal.Decimal][].
- *
  * [BigDecimal]:
  * https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/math/BigDecimal.html
  * [decimal.Decimal]: https://docs.python.org/3/library/decimal.html
@@ -53,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Decimal();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DecimalProto.internal_static_google_type_Decimal_descriptor;
   }
@@ -74,63 +78,47 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * The decimal value, as a string.
-   *
    * The string representation consists of an optional sign, `+` (`U+002B`)
    * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
    * ("the integer"), optionally followed by a fraction, optionally followed
    * by an exponent.
-   *
    * The fraction consists of a decimal point followed by zero or more decimal
    * digits. The string must contain at least one digit in either the integer
    * or the fraction. The number formed by the sign, the integer and the
    * fraction is referred to as the significand.
-   *
    * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
    * followed by one or more decimal digits.
-   *
    * Services **should** normalize decimal values before storing them by:
-   *
    *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-   *
    * Services **may** perform additional normalization based on its own needs
    * and the internal decimal implementation selected, such as shifting the
    * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
    * Additionally, services **may** preserve trailing zeroes in the fraction
    * to indicate increased precision, but are not required to do so.
-   *
    * Note that only the `.` character is supported to divide the integer
    * and the fraction; `,` **should not** be supported regardless of locale.
    * Additionally, thousand separators **should not** be supported. If a
    * service does support them, values **must** be normalized.
-   *
    * The ENBF grammar is:
-   *
    *     DecimalString =
    *       [Sign] Significand [Exponent];
-   *
    *     Sign = '+' | '-';
-   *
    *     Significand =
    *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-   *
    *     Exponent = ('e' | 'E') [Sign] Digits;
-   *
    *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-   *
    * Services **should** clearly document the range of supported values, the
    * maximum supported precision (total number of digits), and, if applicable,
    * the scale (number of digits after the decimal point), as well as how it
    * behaves when receiving out-of-bounds values.
-   *
    * Services **may** choose to accept values passed as input even when the
    * value has a higher precision or scale than the service supports, and
    * **should** round the value to fit the supported scale. Alternatively, the
    * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
    * if precision would be lost.
-   *
    * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
    * gRPC) if the service receives a value outside of the supported range.
    * </pre>
@@ -156,63 +144,47 @@ public java.lang.String getValue() {
    *
    * <pre>
    * The decimal value, as a string.
-   *
    * The string representation consists of an optional sign, `+` (`U+002B`)
    * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
    * ("the integer"), optionally followed by a fraction, optionally followed
    * by an exponent.
-   *
    * The fraction consists of a decimal point followed by zero or more decimal
    * digits. The string must contain at least one digit in either the integer
    * or the fraction. The number formed by the sign, the integer and the
    * fraction is referred to as the significand.
-   *
    * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
    * followed by one or more decimal digits.
-   *
    * Services **should** normalize decimal values before storing them by:
-   *
    *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-   *
    * Services **may** perform additional normalization based on its own needs
    * and the internal decimal implementation selected, such as shifting the
    * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
    * Additionally, services **may** preserve trailing zeroes in the fraction
    * to indicate increased precision, but are not required to do so.
-   *
    * Note that only the `.` character is supported to divide the integer
    * and the fraction; `,` **should not** be supported regardless of locale.
    * Additionally, thousand separators **should not** be supported. If a
    * service does support them, values **must** be normalized.
-   *
    * The ENBF grammar is:
-   *
    *     DecimalString =
    *       [Sign] Significand [Exponent];
-   *
    *     Sign = '+' | '-';
-   *
    *     Significand =
    *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-   *
    *     Exponent = ('e' | 'E') [Sign] Digits;
-   *
    *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-   *
    * Services **should** clearly document the range of supported values, the
    * maximum supported precision (total number of digits), and, if applicable,
    * the scale (number of digits after the decimal point), as well as how it
    * behaves when receiving out-of-bounds values.
-   *
    * Services **may** choose to accept values passed as input even when the
    * value has a higher precision or scale than the service supports, and
    * **should** round the value to fit the supported scale. Alternatively, the
    * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
    * if precision would be lost.
-   *
    * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
    * gRPC) if the service receives a value outside of the supported range.
    * </pre>
@@ -398,7 +370,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * A representation of a decimal value, such as 2.5. Clients may convert values
    * into language-native decimal formats, such as Java's [BigDecimal][] or
    * Python's [decimal.Decimal][].
-   *
    * [BigDecimal]:
    * https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/math/BigDecimal.html
    * [decimal.Decimal]: https://docs.python.org/3/library/decimal.html
@@ -473,6 +444,39 @@ private void buildPartial0(com.google.type.Decimal result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Decimal) {
@@ -547,63 +551,47 @@ public Builder mergeFrom(
      *
      * <pre>
      * The decimal value, as a string.
-     *
      * The string representation consists of an optional sign, `+` (`U+002B`)
      * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
      * ("the integer"), optionally followed by a fraction, optionally followed
      * by an exponent.
-     *
      * The fraction consists of a decimal point followed by zero or more decimal
      * digits. The string must contain at least one digit in either the integer
      * or the fraction. The number formed by the sign, the integer and the
      * fraction is referred to as the significand.
-     *
      * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
      * followed by one or more decimal digits.
-     *
      * Services **should** normalize decimal values before storing them by:
-     *
      *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-     *
      * Services **may** perform additional normalization based on its own needs
      * and the internal decimal implementation selected, such as shifting the
      * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
      * Additionally, services **may** preserve trailing zeroes in the fraction
      * to indicate increased precision, but are not required to do so.
-     *
      * Note that only the `.` character is supported to divide the integer
      * and the fraction; `,` **should not** be supported regardless of locale.
      * Additionally, thousand separators **should not** be supported. If a
      * service does support them, values **must** be normalized.
-     *
      * The ENBF grammar is:
-     *
      *     DecimalString =
      *       [Sign] Significand [Exponent];
-     *
      *     Sign = '+' | '-';
-     *
      *     Significand =
      *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-     *
      *     Exponent = ('e' | 'E') [Sign] Digits;
-     *
      *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-     *
      * Services **should** clearly document the range of supported values, the
      * maximum supported precision (total number of digits), and, if applicable,
      * the scale (number of digits after the decimal point), as well as how it
      * behaves when receiving out-of-bounds values.
-     *
      * Services **may** choose to accept values passed as input even when the
      * value has a higher precision or scale than the service supports, and
      * **should** round the value to fit the supported scale. Alternatively, the
      * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
      * if precision would be lost.
-     *
      * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
      * gRPC) if the service receives a value outside of the supported range.
      * </pre>
@@ -628,63 +616,47 @@ public java.lang.String getValue() {
      *
      * <pre>
      * The decimal value, as a string.
-     *
      * The string representation consists of an optional sign, `+` (`U+002B`)
      * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
      * ("the integer"), optionally followed by a fraction, optionally followed
      * by an exponent.
-     *
      * The fraction consists of a decimal point followed by zero or more decimal
      * digits. The string must contain at least one digit in either the integer
      * or the fraction. The number formed by the sign, the integer and the
      * fraction is referred to as the significand.
-     *
      * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
      * followed by one or more decimal digits.
-     *
      * Services **should** normalize decimal values before storing them by:
-     *
      *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-     *
      * Services **may** perform additional normalization based on its own needs
      * and the internal decimal implementation selected, such as shifting the
      * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
      * Additionally, services **may** preserve trailing zeroes in the fraction
      * to indicate increased precision, but are not required to do so.
-     *
      * Note that only the `.` character is supported to divide the integer
      * and the fraction; `,` **should not** be supported regardless of locale.
      * Additionally, thousand separators **should not** be supported. If a
      * service does support them, values **must** be normalized.
-     *
      * The ENBF grammar is:
-     *
      *     DecimalString =
      *       [Sign] Significand [Exponent];
-     *
      *     Sign = '+' | '-';
-     *
      *     Significand =
      *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-     *
      *     Exponent = ('e' | 'E') [Sign] Digits;
-     *
      *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-     *
      * Services **should** clearly document the range of supported values, the
      * maximum supported precision (total number of digits), and, if applicable,
      * the scale (number of digits after the decimal point), as well as how it
      * behaves when receiving out-of-bounds values.
-     *
      * Services **may** choose to accept values passed as input even when the
      * value has a higher precision or scale than the service supports, and
      * **should** round the value to fit the supported scale. Alternatively, the
      * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
      * if precision would be lost.
-     *
      * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
      * gRPC) if the service receives a value outside of the supported range.
      * </pre>
@@ -709,63 +681,47 @@ public com.google.protobuf.ByteString getValueBytes() {
      *
      * <pre>
      * The decimal value, as a string.
-     *
      * The string representation consists of an optional sign, `+` (`U+002B`)
      * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
      * ("the integer"), optionally followed by a fraction, optionally followed
      * by an exponent.
-     *
      * The fraction consists of a decimal point followed by zero or more decimal
      * digits. The string must contain at least one digit in either the integer
      * or the fraction. The number formed by the sign, the integer and the
      * fraction is referred to as the significand.
-     *
      * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
      * followed by one or more decimal digits.
-     *
      * Services **should** normalize decimal values before storing them by:
-     *
      *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-     *
      * Services **may** perform additional normalization based on its own needs
      * and the internal decimal implementation selected, such as shifting the
      * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
      * Additionally, services **may** preserve trailing zeroes in the fraction
      * to indicate increased precision, but are not required to do so.
-     *
      * Note that only the `.` character is supported to divide the integer
      * and the fraction; `,` **should not** be supported regardless of locale.
      * Additionally, thousand separators **should not** be supported. If a
      * service does support them, values **must** be normalized.
-     *
      * The ENBF grammar is:
-     *
      *     DecimalString =
      *       [Sign] Significand [Exponent];
-     *
      *     Sign = '+' | '-';
-     *
      *     Significand =
      *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-     *
      *     Exponent = ('e' | 'E') [Sign] Digits;
-     *
      *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-     *
      * Services **should** clearly document the range of supported values, the
      * maximum supported precision (total number of digits), and, if applicable,
      * the scale (number of digits after the decimal point), as well as how it
      * behaves when receiving out-of-bounds values.
-     *
      * Services **may** choose to accept values passed as input even when the
      * value has a higher precision or scale than the service supports, and
      * **should** round the value to fit the supported scale. Alternatively, the
      * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
      * if precision would be lost.
-     *
      * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
      * gRPC) if the service receives a value outside of the supported range.
      * </pre>
@@ -789,63 +745,47 @@ public Builder setValue(java.lang.String value) {
      *
      * <pre>
      * The decimal value, as a string.
-     *
      * The string representation consists of an optional sign, `+` (`U+002B`)
      * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
      * ("the integer"), optionally followed by a fraction, optionally followed
      * by an exponent.
-     *
      * The fraction consists of a decimal point followed by zero or more decimal
      * digits. The string must contain at least one digit in either the integer
      * or the fraction. The number formed by the sign, the integer and the
      * fraction is referred to as the significand.
-     *
      * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
      * followed by one or more decimal digits.
-     *
      * Services **should** normalize decimal values before storing them by:
-     *
      *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-     *
      * Services **may** perform additional normalization based on its own needs
      * and the internal decimal implementation selected, such as shifting the
      * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
      * Additionally, services **may** preserve trailing zeroes in the fraction
      * to indicate increased precision, but are not required to do so.
-     *
      * Note that only the `.` character is supported to divide the integer
      * and the fraction; `,` **should not** be supported regardless of locale.
      * Additionally, thousand separators **should not** be supported. If a
      * service does support them, values **must** be normalized.
-     *
      * The ENBF grammar is:
-     *
      *     DecimalString =
      *       [Sign] Significand [Exponent];
-     *
      *     Sign = '+' | '-';
-     *
      *     Significand =
      *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-     *
      *     Exponent = ('e' | 'E') [Sign] Digits;
-     *
      *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-     *
      * Services **should** clearly document the range of supported values, the
      * maximum supported precision (total number of digits), and, if applicable,
      * the scale (number of digits after the decimal point), as well as how it
      * behaves when receiving out-of-bounds values.
-     *
      * Services **may** choose to accept values passed as input even when the
      * value has a higher precision or scale than the service supports, and
      * **should** round the value to fit the supported scale. Alternatively, the
      * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
      * if precision would be lost.
-     *
      * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
      * gRPC) if the service receives a value outside of the supported range.
      * </pre>
@@ -865,63 +805,47 @@ public Builder clearValue() {
      *
      * <pre>
      * The decimal value, as a string.
-     *
      * The string representation consists of an optional sign, `+` (`U+002B`)
      * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
      * ("the integer"), optionally followed by a fraction, optionally followed
      * by an exponent.
-     *
      * The fraction consists of a decimal point followed by zero or more decimal
      * digits. The string must contain at least one digit in either the integer
      * or the fraction. The number formed by the sign, the integer and the
      * fraction is referred to as the significand.
-     *
      * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
      * followed by one or more decimal digits.
-     *
      * Services **should** normalize decimal values before storing them by:
-     *
      *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-     *
      * Services **may** perform additional normalization based on its own needs
      * and the internal decimal implementation selected, such as shifting the
      * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
      * Additionally, services **may** preserve trailing zeroes in the fraction
      * to indicate increased precision, but are not required to do so.
-     *
      * Note that only the `.` character is supported to divide the integer
      * and the fraction; `,` **should not** be supported regardless of locale.
      * Additionally, thousand separators **should not** be supported. If a
      * service does support them, values **must** be normalized.
-     *
      * The ENBF grammar is:
-     *
      *     DecimalString =
      *       [Sign] Significand [Exponent];
-     *
      *     Sign = '+' | '-';
-     *
      *     Significand =
      *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-     *
      *     Exponent = ('e' | 'E') [Sign] Digits;
-     *
      *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-     *
      * Services **should** clearly document the range of supported values, the
      * maximum supported precision (total number of digits), and, if applicable,
      * the scale (number of digits after the decimal point), as well as how it
      * behaves when receiving out-of-bounds values.
-     *
      * Services **may** choose to accept values passed as input even when the
      * value has a higher precision or scale than the service supports, and
      * **should** round the value to fit the supported scale. Alternatively, the
      * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
      * if precision would be lost.
-     *
      * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
      * gRPC) if the service receives a value outside of the supported range.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalOrBuilder.java
index 73e0329eb2..15e152ccc9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalOrBuilder.java
@@ -28,63 +28,47 @@ public interface DecimalOrBuilder
    *
    * <pre>
    * The decimal value, as a string.
-   *
    * The string representation consists of an optional sign, `+` (`U+002B`)
    * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
    * ("the integer"), optionally followed by a fraction, optionally followed
    * by an exponent.
-   *
    * The fraction consists of a decimal point followed by zero or more decimal
    * digits. The string must contain at least one digit in either the integer
    * or the fraction. The number formed by the sign, the integer and the
    * fraction is referred to as the significand.
-   *
    * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
    * followed by one or more decimal digits.
-   *
    * Services **should** normalize decimal values before storing them by:
-   *
    *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-   *
    * Services **may** perform additional normalization based on its own needs
    * and the internal decimal implementation selected, such as shifting the
    * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
    * Additionally, services **may** preserve trailing zeroes in the fraction
    * to indicate increased precision, but are not required to do so.
-   *
    * Note that only the `.` character is supported to divide the integer
    * and the fraction; `,` **should not** be supported regardless of locale.
    * Additionally, thousand separators **should not** be supported. If a
    * service does support them, values **must** be normalized.
-   *
    * The ENBF grammar is:
-   *
    *     DecimalString =
    *       [Sign] Significand [Exponent];
-   *
    *     Sign = '+' | '-';
-   *
    *     Significand =
    *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-   *
    *     Exponent = ('e' | 'E') [Sign] Digits;
-   *
    *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-   *
    * Services **should** clearly document the range of supported values, the
    * maximum supported precision (total number of digits), and, if applicable,
    * the scale (number of digits after the decimal point), as well as how it
    * behaves when receiving out-of-bounds values.
-   *
    * Services **may** choose to accept values passed as input even when the
    * value has a higher precision or scale than the service supports, and
    * **should** round the value to fit the supported scale. Alternatively, the
    * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
    * if precision would be lost.
-   *
    * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
    * gRPC) if the service receives a value outside of the supported range.
    * </pre>
@@ -99,63 +83,47 @@ public interface DecimalOrBuilder
    *
    * <pre>
    * The decimal value, as a string.
-   *
    * The string representation consists of an optional sign, `+` (`U+002B`)
    * or `-` (`U+002D`), followed by a sequence of zero or more decimal digits
    * ("the integer"), optionally followed by a fraction, optionally followed
    * by an exponent.
-   *
    * The fraction consists of a decimal point followed by zero or more decimal
    * digits. The string must contain at least one digit in either the integer
    * or the fraction. The number formed by the sign, the integer and the
    * fraction is referred to as the significand.
-   *
    * The exponent consists of the character `e` (`U+0065`) or `E` (`U+0045`)
    * followed by one or more decimal digits.
-   *
    * Services **should** normalize decimal values before storing them by:
-   *
    *   - Removing an explicitly-provided `+` sign (`+2.5` -&gt; `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -&gt; `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -&gt; `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -&gt; `2.5`).
-   *
    * Services **may** perform additional normalization based on its own needs
    * and the internal decimal implementation selected, such as shifting the
    * decimal point and exponent value together (example: `2.5e-1` &lt;-&gt; `0.25`).
    * Additionally, services **may** preserve trailing zeroes in the fraction
    * to indicate increased precision, but are not required to do so.
-   *
    * Note that only the `.` character is supported to divide the integer
    * and the fraction; `,` **should not** be supported regardless of locale.
    * Additionally, thousand separators **should not** be supported. If a
    * service does support them, values **must** be normalized.
-   *
    * The ENBF grammar is:
-   *
    *     DecimalString =
    *       [Sign] Significand [Exponent];
-   *
    *     Sign = '+' | '-';
-   *
    *     Significand =
    *       Digits ['.'] [Digits] | [Digits] '.' Digits;
-   *
    *     Exponent = ('e' | 'E') [Sign] Digits;
-   *
    *     Digits = { '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' };
-   *
    * Services **should** clearly document the range of supported values, the
    * maximum supported precision (total number of digits), and, if applicable,
    * the scale (number of digits after the decimal point), as well as how it
    * behaves when receiving out-of-bounds values.
-   *
    * Services **may** choose to accept values passed as input even when the
    * value has a higher precision or scale than the service supports, and
    * **should** round the value to fit the supported scale. Alternatively, the
    * service **may** error with `400 Bad Request` (`INVALID_ARGUMENT` in gRPC)
    * if precision would be lost.
-   *
    * Services **should** error with `400 Bad Request` (`INVALID_ARGUMENT` in
    * gRPC) if the service receives a value outside of the supported range.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java
index d6692b298e..24b8e6d689 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java
@@ -25,31 +25,22 @@
  * Represents a textual expression in the Common Expression Language (CEL)
  * syntax. CEL is a C-like expression language. The syntax and semantics of CEL
  * are documented at https://github.com/google/cel-spec.
- *
  * Example (Comparison):
- *
  *     title: "Summary size limit"
  *     description: "Determines if a summary is less than 100 chars"
  *     expression: "document.summary.size() &lt; 100"
- *
  * Example (Equality):
- *
  *     title: "Requestor is owner"
  *     description: "Determines if requestor is the document owner"
  *     expression: "document.owner == request.auth.claims.email"
- *
  * Example (Logic):
- *
  *     title: "Public documents"
  *     description: "Determine whether the document should be publicly visible"
  *     expression: "document.type != 'private' &amp;&amp; document.type != 'internal'"
- *
  * Example (Data Manipulation):
- *
  *     title: "Notification string"
  *     description: "Create a notification string with a timestamp."
  *     expression: "'New message received at ' + string(document.create_time)"
- *
  * The exact variables and functions that may be referenced within an expression
  * are determined by the service that evaluates it. See the service
  * documentation for additional information.
@@ -80,6 +71,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Expr();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.ExprProto.internal_static_google_type_Expr_descriptor;
   }
@@ -497,31 +493,22 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Represents a textual expression in the Common Expression Language (CEL)
    * syntax. CEL is a C-like expression language. The syntax and semantics of CEL
    * are documented at https://github.com/google/cel-spec.
-   *
    * Example (Comparison):
-   *
    *     title: "Summary size limit"
    *     description: "Determines if a summary is less than 100 chars"
    *     expression: "document.summary.size() &lt; 100"
-   *
    * Example (Equality):
-   *
    *     title: "Requestor is owner"
    *     description: "Determines if requestor is the document owner"
    *     expression: "document.owner == request.auth.claims.email"
-   *
    * Example (Logic):
-   *
    *     title: "Public documents"
    *     description: "Determine whether the document should be publicly visible"
    *     expression: "document.type != 'private' &amp;&amp; document.type != 'internal'"
-   *
    * Example (Data Manipulation):
-   *
    *     title: "Notification string"
    *     description: "Create a notification string with a timestamp."
    *     expression: "'New message received at ' + string(document.create_time)"
-   *
    * The exact variables and functions that may be referenced within an expression
    * are determined by the service that evaluates it. See the service
    * documentation for additional information.
@@ -608,6 +595,39 @@ private void buildPartial0(com.google.type.Expr result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Expr) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java
index fd1bb43a24..b2cfd71e8d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java
@@ -45,6 +45,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Fraction();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.FractionProto.internal_static_google_type_Fraction_descriptor;
   }
@@ -340,6 +345,39 @@ private void buildPartial0(com.google.type.Fraction result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Fraction) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java
index 4eee93a5bf..3424d0d429 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java
@@ -24,7 +24,6 @@
  * <pre>
  * Represents a time interval, encoded as a Timestamp start (inclusive) and a
  * Timestamp end (exclusive).
- *
  * The start must be less than or equal to the end.
  * When the start equals the end, the interval is empty (matches no time).
  * When both start and end are unspecified, the interval matches any time.
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Interval();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.IntervalProto.internal_static_google_type_Interval_descriptor;
   }
@@ -69,7 +73,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * </pre>
@@ -87,7 +90,6 @@ public boolean hasStartTime() {
    *
    * <pre>
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * </pre>
@@ -105,7 +107,6 @@ public com.google.protobuf.Timestamp getStartTime() {
    *
    * <pre>
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * </pre>
@@ -124,7 +125,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
    *
    * <pre>
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * </pre>
@@ -142,7 +142,6 @@ public boolean hasEndTime() {
    *
    * <pre>
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * </pre>
@@ -160,7 +159,6 @@ public com.google.protobuf.Timestamp getEndTime() {
    *
    * <pre>
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * </pre>
@@ -354,7 +352,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre>
    * Represents a time interval, encoded as a Timestamp start (inclusive) and a
    * Timestamp end (exclusive).
-   *
    * The start must be less than or equal to the end.
    * When the start equals the end, the interval is empty (matches no time).
    * When both start and end are unspecified, the interval matches any time.
@@ -441,6 +438,39 @@ private void buildPartial0(com.google.type.Interval result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Interval) {
@@ -527,7 +557,6 @@ public Builder mergeFrom(
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -544,7 +573,6 @@ public boolean hasStartTime() {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -565,7 +593,6 @@ public com.google.protobuf.Timestamp getStartTime() {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -590,7 +617,6 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -612,7 +638,6 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -640,7 +665,6 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -662,7 +686,6 @@ public Builder clearStartTime() {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -679,7 +702,6 @@ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -698,7 +720,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      *
      * <pre>
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * </pre>
@@ -733,7 +754,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -750,7 +770,6 @@ public boolean hasEndTime() {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -771,7 +790,6 @@ public com.google.protobuf.Timestamp getEndTime() {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -796,7 +814,6 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -818,7 +835,6 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -846,7 +862,6 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -868,7 +883,6 @@ public Builder clearEndTime() {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -885,7 +899,6 @@ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
@@ -904,7 +917,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
      *
      * <pre>
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalOrBuilder.java
index 0efe6bf8b5..3267b41792 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalOrBuilder.java
@@ -28,7 +28,6 @@ public interface IntervalOrBuilder
    *
    * <pre>
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * </pre>
@@ -43,7 +42,6 @@ public interface IntervalOrBuilder
    *
    * <pre>
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * </pre>
@@ -58,7 +56,6 @@ public interface IntervalOrBuilder
    *
    * <pre>
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * </pre>
@@ -72,7 +69,6 @@ public interface IntervalOrBuilder
    *
    * <pre>
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * </pre>
@@ -87,7 +83,6 @@ public interface IntervalOrBuilder
    *
    * <pre>
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * </pre>
@@ -102,7 +97,6 @@ public interface IntervalOrBuilder
    *
    * <pre>
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLng.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
index e4fe01ccbb..2af3af9f69 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new LatLng();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.LatLngProto.internal_static_google_type_LatLng_descriptor;
   }
@@ -355,6 +360,39 @@ private void buildPartial0(com.google.type.LatLng result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.LatLng) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java
index 362fa0d001..d9175895a3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new LocalizedText();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.LocalizedTextProto.internal_static_google_type_LocalizedText_descriptor;
   }
@@ -121,7 +126,6 @@ public com.google.protobuf.ByteString getTextBytes() {
    *
    * <pre>
    * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-   *
    * For more information, see
    * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
    * </pre>
@@ -147,7 +151,6 @@ public java.lang.String getLanguageCode() {
    *
    * <pre>
    * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-   *
    * For more information, see
    * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
    * </pre>
@@ -418,6 +421,39 @@ private void buildPartial0(com.google.type.LocalizedText result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.LocalizedText) {
@@ -609,7 +645,6 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-     *
      * For more information, see
      * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
      * </pre>
@@ -634,7 +669,6 @@ public java.lang.String getLanguageCode() {
      *
      * <pre>
      * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-     *
      * For more information, see
      * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
      * </pre>
@@ -659,7 +693,6 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
      *
      * <pre>
      * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-     *
      * For more information, see
      * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
      * </pre>
@@ -683,7 +716,6 @@ public Builder setLanguageCode(java.lang.String value) {
      *
      * <pre>
      * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-     *
      * For more information, see
      * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
      * </pre>
@@ -703,7 +735,6 @@ public Builder clearLanguageCode() {
      *
      * <pre>
      * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-     *
      * For more information, see
      * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
      * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextOrBuilder.java
index ff8778cea4..c103886996 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextOrBuilder.java
@@ -53,7 +53,6 @@ public interface LocalizedTextOrBuilder
    *
    * <pre>
    * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-   *
    * For more information, see
    * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
    * </pre>
@@ -68,7 +67,6 @@ public interface LocalizedTextOrBuilder
    *
    * <pre>
    * The text's BCP-47 language code, such as "en-US" or "sr-Latn".
-   *
    * For more information, see
    * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
    * </pre>
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java
index d1f445544b..bf2afe6d29 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java
@@ -47,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Money();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.MoneyProto.internal_static_google_type_Money_descriptor;
   }
@@ -411,6 +416,39 @@ private void buildPartial0(com.google.type.Money result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Money) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java
index d2d0dfbcb2..b4d9d9b595 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java
@@ -23,21 +23,15 @@
  *
  * <pre>
  * An object representing a phone number, suitable as an API wire format.
- *
  * This representation:
- *
  *  - should not be used for locale-specific formatting of a phone number, such
  *    as "+1 (650) 253-0000 ext. 123"
- *
  *  - is not designed for efficient storage
  *  - may not be suitable for dialing - specialized libraries (see references)
  *    should be used to parse the number for that purpose
- *
  * To do something meaningful with this number, such as format it for various
  * use-cases, convert it to an `i18n.phonenumbers.PhoneNumber` object first.
- *
  * For instance, in Java this would be:
- *
  *    com.google.type.PhoneNumber wireProto =
  *        com.google.type.PhoneNumber.newBuilder().build();
  *    com.google.i18n.phonenumbers.Phonenumber.PhoneNumber phoneNumber =
@@ -45,7 +39,6 @@
  *    if (!wireProto.getExtension().isEmpty()) {
  *      phoneNumber.setExtension(wireProto.getExtension());
  *    }
- *
  *  Reference(s):
  *   - https://github.com/google/libphonenumber
  * </pre>
@@ -72,6 +65,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PhoneNumber();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.PhoneNumberProto.internal_static_google_type_PhoneNumber_descriptor;
   }
@@ -96,7 +94,6 @@ public interface ShortCodeOrBuilder
      * <pre>
      * Required. The BCP-47 region code of the location where calls to this
      * short code can be made, such as "US" and "BB".
-     *
      * Reference(s):
      *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
      * </pre>
@@ -112,7 +109,6 @@ public interface ShortCodeOrBuilder
      * <pre>
      * Required. The BCP-47 region code of the location where calls to this
      * short code can be made, such as "US" and "BB".
-     *
      * Reference(s):
      *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
      * </pre>
@@ -158,7 +154,6 @@ public interface ShortCodeOrBuilder
    * typically much shorter than regular phone numbers and can be used to
    * address messages in MMS and SMS systems, as well as for abbreviated dialing
    * (e.g. "Text 611 to see how many minutes you have remaining on your plan.").
-   *
    * Short codes are restricted to a region and are not internationally
    * dialable, which means the same short code can exist in different regions,
    * with different usage and pricing, even if those regions share the same
@@ -188,6 +183,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ShortCode();
     }
 
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.type.PhoneNumberProto
           .internal_static_google_type_PhoneNumber_ShortCode_descriptor;
@@ -213,7 +213,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      * <pre>
      * Required. The BCP-47 region code of the location where calls to this
      * short code can be made, such as "US" and "BB".
-     *
      * Reference(s):
      *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
      * </pre>
@@ -240,7 +239,6 @@ public java.lang.String getRegionCode() {
      * <pre>
      * Required. The BCP-47 region code of the location where calls to this
      * short code can be made, such as "US" and "BB".
-     *
      * Reference(s):
      *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
      * </pre>
@@ -491,7 +489,6 @@ protected Builder newBuilderForType(
      * typically much shorter than regular phone numbers and can be used to
      * address messages in MMS and SMS systems, as well as for abbreviated dialing
      * (e.g. "Text 611 to see how many minutes you have remaining on your plan.").
-     *
      * Short codes are restricted to a region and are not internationally
      * dialable, which means the same short code can exist in different regions,
      * with different usage and pricing, even if those regions share the same
@@ -577,6 +574,41 @@ private void buildPartial0(com.google.type.PhoneNumber.ShortCode result) {
         }
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.type.PhoneNumber.ShortCode) {
@@ -663,7 +695,6 @@ public Builder mergeFrom(
        * <pre>
        * Required. The BCP-47 region code of the location where calls to this
        * short code can be made, such as "US" and "BB".
-       *
        * Reference(s):
        *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
        * </pre>
@@ -689,7 +720,6 @@ public java.lang.String getRegionCode() {
        * <pre>
        * Required. The BCP-47 region code of the location where calls to this
        * short code can be made, such as "US" and "BB".
-       *
        * Reference(s):
        *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
        * </pre>
@@ -715,7 +745,6 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
        * <pre>
        * Required. The BCP-47 region code of the location where calls to this
        * short code can be made, such as "US" and "BB".
-       *
        * Reference(s):
        *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
        * </pre>
@@ -740,7 +769,6 @@ public Builder setRegionCode(java.lang.String value) {
        * <pre>
        * Required. The BCP-47 region code of the location where calls to this
        * short code can be made, such as "US" and "BB".
-       *
        * Reference(s):
        *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
        * </pre>
@@ -761,7 +789,6 @@ public Builder clearRegionCode() {
        * <pre>
        * Required. The BCP-47 region code of the location where calls to this
        * short code can be made, such as "US" and "BB".
-       *
        * Reference(s):
        *  - http://www.unicode.org/reports/tr35/#unicode_region_subtag
        * </pre>
@@ -958,8 +985,6 @@ public com.google.type.PhoneNumber.ShortCode getDefaultInstanceForType() {
   }
 
   private int kindCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object kind_;
 
   public enum KindCase
@@ -1017,11 +1042,9 @@ public KindCase getKindCase() {
    * additional spaces or formatting, e.g.:
    *  - correct: "+15552220123"
    *  - incorrect: "+1 (555) 222-01234 x123".
-   *
    * The ITU E.164 format limits the latter to 12 digits, but in practice not
    * all countries respect that, so we relax that restriction here.
    * National-only numbers are not allowed.
-   *
    * References:
    *  - https://www.itu.int/rec/T-REC-E.164-201011-I
    *  - https://en.wikipedia.org/wiki/E.164.
@@ -1045,11 +1068,9 @@ public boolean hasE164Number() {
    * additional spaces or formatting, e.g.:
    *  - correct: "+15552220123"
    *  - incorrect: "+1 (555) 222-01234 x123".
-   *
    * The ITU E.164 format limits the latter to 12 digits, but in practice not
    * all countries respect that, so we relax that restriction here.
    * National-only numbers are not allowed.
-   *
    * References:
    *  - https://www.itu.int/rec/T-REC-E.164-201011-I
    *  - https://en.wikipedia.org/wiki/E.164.
@@ -1086,11 +1107,9 @@ public java.lang.String getE164Number() {
    * additional spaces or formatting, e.g.:
    *  - correct: "+15552220123"
    *  - incorrect: "+1 (555) 222-01234 x123".
-   *
    * The ITU E.164 format limits the latter to 12 digits, but in practice not
    * all countries respect that, so we relax that restriction here.
    * National-only numbers are not allowed.
-   *
    * References:
    *  - https://www.itu.int/rec/T-REC-E.164-201011-I
    *  - https://en.wikipedia.org/wiki/E.164.
@@ -1124,7 +1143,6 @@ public com.google.protobuf.ByteString getE164NumberBytes() {
    *
    * <pre>
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * </pre>
@@ -1142,7 +1160,6 @@ public boolean hasShortCode() {
    *
    * <pre>
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * </pre>
@@ -1163,7 +1180,6 @@ public com.google.type.PhoneNumber.ShortCode getShortCode() {
    *
    * <pre>
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * </pre>
@@ -1190,7 +1206,6 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
    * recommendations, except for being defined as a series of numbers with a
    * maximum length of 40 digits. Other than digits, some other dialing
    * characters such as ',' (indicating a wait) or '#' may be stored here.
-   *
    * Note that no regions currently use extensions with short codes, so this
    * field is normally only set in conjunction with an E.164 number. It is held
    * separately from the E.164 number to allow for short code extensions in the
@@ -1221,7 +1236,6 @@ public java.lang.String getExtension() {
    * recommendations, except for being defined as a series of numbers with a
    * maximum length of 40 digits. Other than digits, some other dialing
    * characters such as ',' (indicating a wait) or '#' may be stored here.
-   *
    * Note that no regions currently use extensions with short codes, so this
    * field is normally only set in conjunction with an E.164 number. It is held
    * separately from the E.164 number to allow for short code extensions in the
@@ -1444,21 +1458,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * An object representing a phone number, suitable as an API wire format.
-   *
    * This representation:
-   *
    *  - should not be used for locale-specific formatting of a phone number, such
    *    as "+1 (650) 253-0000 ext. 123"
-   *
    *  - is not designed for efficient storage
    *  - may not be suitable for dialing - specialized libraries (see references)
    *    should be used to parse the number for that purpose
-   *
    * To do something meaningful with this number, such as format it for various
    * use-cases, convert it to an `i18n.phonenumbers.PhoneNumber` object first.
-   *
    * For instance, in Java this would be:
-   *
    *    com.google.type.PhoneNumber wireProto =
    *        com.google.type.PhoneNumber.newBuilder().build();
    *    com.google.i18n.phonenumbers.Phonenumber.PhoneNumber phoneNumber =
@@ -1466,7 +1474,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *    if (!wireProto.getExtension().isEmpty()) {
    *      phoneNumber.setExtension(wireProto.getExtension());
    *    }
-   *
    *  Reference(s):
    *   - https://github.com/google/libphonenumber
    * </pre>
@@ -1555,6 +1562,39 @@ private void buildPartialOneofs(com.google.type.PhoneNumber result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.PhoneNumber) {
@@ -1678,11 +1718,9 @@ public Builder clearKind() {
      * additional spaces or formatting, e.g.:
      *  - correct: "+15552220123"
      *  - incorrect: "+1 (555) 222-01234 x123".
-     *
      * The ITU E.164 format limits the latter to 12 digits, but in practice not
      * all countries respect that, so we relax that restriction here.
      * National-only numbers are not allowed.
-     *
      * References:
      *  - https://www.itu.int/rec/T-REC-E.164-201011-I
      *  - https://en.wikipedia.org/wiki/E.164.
@@ -1707,11 +1745,9 @@ public boolean hasE164Number() {
      * additional spaces or formatting, e.g.:
      *  - correct: "+15552220123"
      *  - incorrect: "+1 (555) 222-01234 x123".
-     *
      * The ITU E.164 format limits the latter to 12 digits, but in practice not
      * all countries respect that, so we relax that restriction here.
      * National-only numbers are not allowed.
-     *
      * References:
      *  - https://www.itu.int/rec/T-REC-E.164-201011-I
      *  - https://en.wikipedia.org/wiki/E.164.
@@ -1749,11 +1785,9 @@ public java.lang.String getE164Number() {
      * additional spaces or formatting, e.g.:
      *  - correct: "+15552220123"
      *  - incorrect: "+1 (555) 222-01234 x123".
-     *
      * The ITU E.164 format limits the latter to 12 digits, but in practice not
      * all countries respect that, so we relax that restriction here.
      * National-only numbers are not allowed.
-     *
      * References:
      *  - https://www.itu.int/rec/T-REC-E.164-201011-I
      *  - https://en.wikipedia.org/wiki/E.164.
@@ -1791,11 +1825,9 @@ public com.google.protobuf.ByteString getE164NumberBytes() {
      * additional spaces or formatting, e.g.:
      *  - correct: "+15552220123"
      *  - incorrect: "+1 (555) 222-01234 x123".
-     *
      * The ITU E.164 format limits the latter to 12 digits, but in practice not
      * all countries respect that, so we relax that restriction here.
      * National-only numbers are not allowed.
-     *
      * References:
      *  - https://www.itu.int/rec/T-REC-E.164-201011-I
      *  - https://en.wikipedia.org/wiki/E.164.
@@ -1826,11 +1858,9 @@ public Builder setE164Number(java.lang.String value) {
      * additional spaces or formatting, e.g.:
      *  - correct: "+15552220123"
      *  - incorrect: "+1 (555) 222-01234 x123".
-     *
      * The ITU E.164 format limits the latter to 12 digits, but in practice not
      * all countries respect that, so we relax that restriction here.
      * National-only numbers are not allowed.
-     *
      * References:
      *  - https://www.itu.int/rec/T-REC-E.164-201011-I
      *  - https://en.wikipedia.org/wiki/E.164.
@@ -1859,11 +1889,9 @@ public Builder clearE164Number() {
      * additional spaces or formatting, e.g.:
      *  - correct: "+15552220123"
      *  - incorrect: "+1 (555) 222-01234 x123".
-     *
      * The ITU E.164 format limits the latter to 12 digits, but in practice not
      * all countries respect that, so we relax that restriction here.
      * National-only numbers are not allowed.
-     *
      * References:
      *  - https://www.itu.int/rec/T-REC-E.164-201011-I
      *  - https://en.wikipedia.org/wiki/E.164.
@@ -1896,7 +1924,6 @@ public Builder setE164NumberBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -1914,7 +1941,6 @@ public boolean hasShortCode() {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -1942,7 +1968,6 @@ public com.google.type.PhoneNumber.ShortCode getShortCode() {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -1967,7 +1992,6 @@ public Builder setShortCode(com.google.type.PhoneNumber.ShortCode value) {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -1989,7 +2013,6 @@ public Builder setShortCode(com.google.type.PhoneNumber.ShortCode.Builder builde
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -2023,7 +2046,6 @@ public Builder mergeShortCode(com.google.type.PhoneNumber.ShortCode value) {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -2051,7 +2073,6 @@ public Builder clearShortCode() {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -2066,7 +2087,6 @@ public com.google.type.PhoneNumber.ShortCode.Builder getShortCodeBuilder() {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -2089,7 +2109,6 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
      *
      * <pre>
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * </pre>
@@ -2127,7 +2146,6 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
      * recommendations, except for being defined as a series of numbers with a
      * maximum length of 40 digits. Other than digits, some other dialing
      * characters such as ',' (indicating a wait) or '#' may be stored here.
-     *
      * Note that no regions currently use extensions with short codes, so this
      * field is normally only set in conjunction with an E.164 number. It is held
      * separately from the E.164 number to allow for short code extensions in the
@@ -2157,7 +2175,6 @@ public java.lang.String getExtension() {
      * recommendations, except for being defined as a series of numbers with a
      * maximum length of 40 digits. Other than digits, some other dialing
      * characters such as ',' (indicating a wait) or '#' may be stored here.
-     *
      * Note that no regions currently use extensions with short codes, so this
      * field is normally only set in conjunction with an E.164 number. It is held
      * separately from the E.164 number to allow for short code extensions in the
@@ -2187,7 +2204,6 @@ public com.google.protobuf.ByteString getExtensionBytes() {
      * recommendations, except for being defined as a series of numbers with a
      * maximum length of 40 digits. Other than digits, some other dialing
      * characters such as ',' (indicating a wait) or '#' may be stored here.
-     *
      * Note that no regions currently use extensions with short codes, so this
      * field is normally only set in conjunction with an E.164 number. It is held
      * separately from the E.164 number to allow for short code extensions in the
@@ -2216,7 +2232,6 @@ public Builder setExtension(java.lang.String value) {
      * recommendations, except for being defined as a series of numbers with a
      * maximum length of 40 digits. Other than digits, some other dialing
      * characters such as ',' (indicating a wait) or '#' may be stored here.
-     *
      * Note that no regions currently use extensions with short codes, so this
      * field is normally only set in conjunction with an E.164 number. It is held
      * separately from the E.164 number to allow for short code extensions in the
@@ -2241,7 +2256,6 @@ public Builder clearExtension() {
      * recommendations, except for being defined as a series of numbers with a
      * maximum length of 40 digits. Other than digits, some other dialing
      * characters such as ',' (indicating a wait) or '#' may be stored here.
-     *
      * Note that no regions currently use extensions with short codes, so this
      * field is normally only set in conjunction with an E.164 number. It is held
      * separately from the E.164 number to allow for short code extensions in the
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberOrBuilder.java
index a29bc63aa0..00bd363c71 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberOrBuilder.java
@@ -33,11 +33,9 @@ public interface PhoneNumberOrBuilder
    * additional spaces or formatting, e.g.:
    *  - correct: "+15552220123"
    *  - incorrect: "+1 (555) 222-01234 x123".
-   *
    * The ITU E.164 format limits the latter to 12 digits, but in practice not
    * all countries respect that, so we relax that restriction here.
    * National-only numbers are not allowed.
-   *
    * References:
    *  - https://www.itu.int/rec/T-REC-E.164-201011-I
    *  - https://en.wikipedia.org/wiki/E.164.
@@ -59,11 +57,9 @@ public interface PhoneNumberOrBuilder
    * additional spaces or formatting, e.g.:
    *  - correct: "+15552220123"
    *  - incorrect: "+1 (555) 222-01234 x123".
-   *
    * The ITU E.164 format limits the latter to 12 digits, but in practice not
    * all countries respect that, so we relax that restriction here.
    * National-only numbers are not allowed.
-   *
    * References:
    *  - https://www.itu.int/rec/T-REC-E.164-201011-I
    *  - https://en.wikipedia.org/wiki/E.164.
@@ -85,11 +81,9 @@ public interface PhoneNumberOrBuilder
    * additional spaces or formatting, e.g.:
    *  - correct: "+15552220123"
    *  - incorrect: "+1 (555) 222-01234 x123".
-   *
    * The ITU E.164 format limits the latter to 12 digits, but in practice not
    * all countries respect that, so we relax that restriction here.
    * National-only numbers are not allowed.
-   *
    * References:
    *  - https://www.itu.int/rec/T-REC-E.164-201011-I
    *  - https://en.wikipedia.org/wiki/E.164.
@@ -107,7 +101,6 @@ public interface PhoneNumberOrBuilder
    *
    * <pre>
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * </pre>
@@ -122,7 +115,6 @@ public interface PhoneNumberOrBuilder
    *
    * <pre>
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * </pre>
@@ -137,7 +129,6 @@ public interface PhoneNumberOrBuilder
    *
    * <pre>
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * </pre>
@@ -154,7 +145,6 @@ public interface PhoneNumberOrBuilder
    * recommendations, except for being defined as a series of numbers with a
    * maximum length of 40 digits. Other than digits, some other dialing
    * characters such as ',' (indicating a wait) or '#' may be stored here.
-   *
    * Note that no regions currently use extensions with short codes, so this
    * field is normally only set in conjunction with an E.164 number. It is held
    * separately from the E.164 number to allow for short code extensions in the
@@ -174,7 +164,6 @@ public interface PhoneNumberOrBuilder
    * recommendations, except for being defined as a series of numbers with a
    * maximum length of 40 digits. Other than digits, some other dialing
    * characters such as ',' (indicating a wait) or '#' may be stored here.
-   *
    * Note that no regions currently use extensions with short codes, so this
    * field is normally only set in conjunction with an E.164 number. It is held
    * separately from the E.164 number to allow for short code extensions in the
@@ -187,5 +176,5 @@ public interface PhoneNumberOrBuilder
    */
   com.google.protobuf.ByteString getExtensionBytes();
 
-  com.google.type.PhoneNumber.KindCase getKindCase();
+  public com.google.type.PhoneNumber.KindCase getKindCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
index 02cfa4c0a3..bd83a5b3ba 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
@@ -27,16 +27,13 @@
  * Box or similar.
  * It is not intended to model geographical locations (roads, towns,
  * mountains).
- *
  * In typical usage an address would be created via user input or from importing
  * existing data, depending on the type of process.
- *
  * Advice on address input / editing:
  *  - Use an i18n-ready address widget such as
  *    https://github.com/google/libaddressinput)
  * - Users should not be presented with UI elements for input or editing of
  *   fields outside countries where that field is used.
- *
  * For more guidance on how to use this schema, please see:
  * https://support.google.com/business/answer/6397478
  * </pre>
@@ -61,8 +58,8 @@ private PostalAddress() {
     administrativeArea_ = "";
     locality_ = "";
     sublocality_ = "";
-    addressLines_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    recipients_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    addressLines_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     organization_ = "";
   }
 
@@ -72,6 +69,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PostalAddress();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_descriptor;
   }
@@ -93,7 +95,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * The schema revision of the `PostalAddress`. This must be set to 0, which is
    * the latest revision.
-   *
    * All new revisions **must** be backward compatible with old revisions.
    * </pre>
    *
@@ -180,10 +181,8 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
    * This can affect formatting in certain countries, but is not critical
    * to the correctness of the data and will never affect any validation or
    * other non-formatting related operations.
-   *
    * If this value is not known, it should be omitted (rather than specifying a
    * possibly incorrect default).
-   *
    * Examples: "zh-Hant", "ja", "ja-Latn", "en".
    * </pre>
    *
@@ -214,10 +213,8 @@ public java.lang.String getLanguageCode() {
    * This can affect formatting in certain countries, but is not critical
    * to the correctness of the data and will never affect any validation or
    * other non-formatting related operations.
-   *
    * If this value is not known, it should be omitted (rather than specifying a
    * possibly incorrect default).
-   *
    * Examples: "zh-Hant", "ja", "ja-Latn", "en".
    * </pre>
    *
@@ -530,14 +527,12 @@ public com.google.protobuf.ByteString getSublocalityBytes() {
   public static final int ADDRESS_LINES_FIELD_NUMBER = 9;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList addressLines_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList addressLines_;
   /**
    *
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -546,14 +541,12 @@ public com.google.protobuf.ByteString getSublocalityBytes() {
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -572,7 +565,6 @@ public com.google.protobuf.ProtocolStringList getAddressLinesList() {
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -581,14 +573,12 @@ public com.google.protobuf.ProtocolStringList getAddressLinesList() {
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -607,7 +597,6 @@ public int getAddressLinesCount() {
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -616,14 +605,12 @@ public int getAddressLinesCount() {
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -643,7 +630,6 @@ public java.lang.String getAddressLines(int index) {
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -652,14 +638,12 @@ public java.lang.String getAddressLines(int index) {
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -678,8 +662,7 @@ public com.google.protobuf.ByteString getAddressLinesBytes(int index) {
   public static final int RECIPIENTS_FIELD_NUMBER = 10;
 
   @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList recipients_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList recipients_;
   /**
    *
    *
@@ -1068,16 +1051,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Box or similar.
    * It is not intended to model geographical locations (roads, towns,
    * mountains).
-   *
    * In typical usage an address would be created via user input or from importing
    * existing data, depending on the type of process.
-   *
    * Advice on address input / editing:
    *  - Use an i18n-ready address widget such as
    *    https://github.com/google/libaddressinput)
    * - Users should not be presented with UI elements for input or editing of
    *   fields outside countries where that field is used.
-   *
    * For more guidance on how to use this schema, please see:
    * https://support.google.com/business/answer/6397478
    * </pre>
@@ -1121,8 +1101,10 @@ public Builder clear() {
       administrativeArea_ = "";
       locality_ = "";
       sublocality_ = "";
-      addressLines_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      recipients_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      addressLines_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000200);
       organization_ = "";
       return this;
     }
@@ -1150,6 +1132,7 @@ public com.google.type.PostalAddress build() {
     @java.lang.Override
     public com.google.type.PostalAddress buildPartial() {
       com.google.type.PostalAddress result = new com.google.type.PostalAddress(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -1157,6 +1140,19 @@ public com.google.type.PostalAddress buildPartial() {
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.type.PostalAddress result) {
+      if (((bitField0_ & 0x00000100) != 0)) {
+        addressLines_ = addressLines_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000100);
+      }
+      result.addressLines_ = addressLines_;
+      if (((bitField0_ & 0x00000200) != 0)) {
+        recipients_ = recipients_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000200);
+      }
+      result.recipients_ = recipients_;
+    }
+
     private void buildPartial0(com.google.type.PostalAddress result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1183,19 +1179,44 @@ private void buildPartial0(com.google.type.PostalAddress result) {
       if (((from_bitField0_ & 0x00000080) != 0)) {
         result.sublocality_ = sublocality_;
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        addressLines_.makeImmutable();
-        result.addressLines_ = addressLines_;
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        recipients_.makeImmutable();
-        result.recipients_ = recipients_;
-      }
       if (((from_bitField0_ & 0x00000400) != 0)) {
         result.organization_ = organization_;
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.PostalAddress) {
@@ -1249,7 +1270,7 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       if (!other.addressLines_.isEmpty()) {
         if (addressLines_.isEmpty()) {
           addressLines_ = other.addressLines_;
-          bitField0_ |= 0x00000100;
+          bitField0_ = (bitField0_ & ~0x00000100);
         } else {
           ensureAddressLinesIsMutable();
           addressLines_.addAll(other.addressLines_);
@@ -1259,7 +1280,7 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       if (!other.recipients_.isEmpty()) {
         if (recipients_.isEmpty()) {
           recipients_ = other.recipients_;
-          bitField0_ |= 0x00000200;
+          bitField0_ = (bitField0_ & ~0x00000200);
         } else {
           ensureRecipientsIsMutable();
           recipients_.addAll(other.recipients_);
@@ -1391,7 +1412,6 @@ public Builder mergeFrom(
      * <pre>
      * The schema revision of the `PostalAddress`. This must be set to 0, which is
      * the latest revision.
-     *
      * All new revisions **must** be backward compatible with old revisions.
      * </pre>
      *
@@ -1409,7 +1429,6 @@ public int getRevision() {
      * <pre>
      * The schema revision of the `PostalAddress`. This must be set to 0, which is
      * the latest revision.
-     *
      * All new revisions **must** be backward compatible with old revisions.
      * </pre>
      *
@@ -1431,7 +1450,6 @@ public Builder setRevision(int value) {
      * <pre>
      * The schema revision of the `PostalAddress`. This must be set to 0, which is
      * the latest revision.
-     *
      * All new revisions **must** be backward compatible with old revisions.
      * </pre>
      *
@@ -1584,10 +1602,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
      * This can affect formatting in certain countries, but is not critical
      * to the correctness of the data and will never affect any validation or
      * other non-formatting related operations.
-     *
      * If this value is not known, it should be omitted (rather than specifying a
      * possibly incorrect default).
-     *
      * Examples: "zh-Hant", "ja", "ja-Latn", "en".
      * </pre>
      *
@@ -1617,10 +1633,8 @@ public java.lang.String getLanguageCode() {
      * This can affect formatting in certain countries, but is not critical
      * to the correctness of the data and will never affect any validation or
      * other non-formatting related operations.
-     *
      * If this value is not known, it should be omitted (rather than specifying a
      * possibly incorrect default).
-     *
      * Examples: "zh-Hant", "ja", "ja-Latn", "en".
      * </pre>
      *
@@ -1650,10 +1664,8 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
      * This can affect formatting in certain countries, but is not critical
      * to the correctness of the data and will never affect any validation or
      * other non-formatting related operations.
-     *
      * If this value is not known, it should be omitted (rather than specifying a
      * possibly incorrect default).
-     *
      * Examples: "zh-Hant", "ja", "ja-Latn", "en".
      * </pre>
      *
@@ -1682,10 +1694,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * This can affect formatting in certain countries, but is not critical
      * to the correctness of the data and will never affect any validation or
      * other non-formatting related operations.
-     *
      * If this value is not known, it should be omitted (rather than specifying a
      * possibly incorrect default).
-     *
      * Examples: "zh-Hant", "ja", "ja-Latn", "en".
      * </pre>
      *
@@ -1710,10 +1720,8 @@ public Builder clearLanguageCode() {
      * This can affect formatting in certain countries, but is not critical
      * to the correctness of the data and will never affect any validation or
      * other non-formatting related operations.
-     *
      * If this value is not known, it should be omitted (rather than specifying a
      * possibly incorrect default).
-     *
      * Examples: "zh-Hant", "ja", "ja-Latn", "en".
      * </pre>
      *
@@ -2348,21 +2356,20 @@ public Builder setSublocalityBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList addressLines_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList addressLines_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAddressLinesIsMutable() {
-      if (!addressLines_.isModifiable()) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         addressLines_ = new com.google.protobuf.LazyStringArrayList(addressLines_);
+        bitField0_ |= 0x00000100;
       }
-      bitField0_ |= 0x00000100;
     }
     /**
      *
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2371,14 +2378,12 @@ private void ensureAddressLinesIsMutable() {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2390,15 +2395,13 @@ private void ensureAddressLinesIsMutable() {
      * @return A list containing the addressLines.
      */
     public com.google.protobuf.ProtocolStringList getAddressLinesList() {
-      addressLines_.makeImmutable();
-      return addressLines_;
+      return addressLines_.getUnmodifiableView();
     }
     /**
      *
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2407,14 +2410,12 @@ public com.google.protobuf.ProtocolStringList getAddressLinesList() {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2433,7 +2434,6 @@ public int getAddressLinesCount() {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2442,14 +2442,12 @@ public int getAddressLinesCount() {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2469,7 +2467,6 @@ public java.lang.String getAddressLines(int index) {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2478,14 +2475,12 @@ public java.lang.String getAddressLines(int index) {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2505,7 +2500,6 @@ public com.google.protobuf.ByteString getAddressLinesBytes(int index) {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2514,14 +2508,12 @@ public com.google.protobuf.ByteString getAddressLinesBytes(int index) {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2540,7 +2532,6 @@ public Builder setAddressLines(int index, java.lang.String value) {
       }
       ensureAddressLinesIsMutable();
       addressLines_.set(index, value);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2549,7 +2540,6 @@ public Builder setAddressLines(int index, java.lang.String value) {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2558,14 +2548,12 @@ public Builder setAddressLines(int index, java.lang.String value) {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2583,7 +2571,6 @@ public Builder addAddressLines(java.lang.String value) {
       }
       ensureAddressLinesIsMutable();
       addressLines_.add(value);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2592,7 +2579,6 @@ public Builder addAddressLines(java.lang.String value) {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2601,14 +2587,12 @@ public Builder addAddressLines(java.lang.String value) {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2623,7 +2607,6 @@ public Builder addAddressLines(java.lang.String value) {
     public Builder addAllAddressLines(java.lang.Iterable<java.lang.String> values) {
       ensureAddressLinesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, addressLines_);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2632,7 +2615,6 @@ public Builder addAllAddressLines(java.lang.Iterable<java.lang.String> values) {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2641,14 +2623,12 @@ public Builder addAllAddressLines(java.lang.Iterable<java.lang.String> values) {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2660,9 +2640,8 @@ public Builder addAllAddressLines(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearAddressLines() {
-      addressLines_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      addressLines_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000100);
-      ;
       onChanged();
       return this;
     }
@@ -2671,7 +2650,6 @@ public Builder clearAddressLines() {
      *
      * <pre>
      * Unstructured address lines describing the lower levels of an address.
-     *
      * Because values in address_lines do not have type information and may
      * sometimes contain multiple values in a single field (e.g.
      * "Austin, TX"), it is important that the line order is clear. The order of
@@ -2680,14 +2658,12 @@ public Builder clearAddressLines() {
      * used to make it explicit (e.g. "ja" for large-to-small ordering and
      * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
      * an address can be selected based on the language.
-     *
      * The minimum permitted structural representation of an address consists
      * of a region_code with all remaining information placed in the
      * address_lines. It would be possible to format such an address very
      * approximately without geocoding, but no semantic reasoning could be
      * made about any of the address components until it was at least
      * partially resolved.
-     *
      * Creating an address only containing a region_code and address_lines, and
      * then geocoding is the recommended way to handle completely unstructured
      * addresses (as opposed to guessing which parts of the address should be
@@ -2706,19 +2682,18 @@ public Builder addAddressLinesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureAddressLinesIsMutable();
       addressLines_.add(value);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList recipients_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList recipients_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRecipientsIsMutable() {
-      if (!recipients_.isModifiable()) {
+      if (!((bitField0_ & 0x00000200) != 0)) {
         recipients_ = new com.google.protobuf.LazyStringArrayList(recipients_);
+        bitField0_ |= 0x00000200;
       }
-      bitField0_ |= 0x00000200;
     }
     /**
      *
@@ -2734,8 +2709,7 @@ private void ensureRecipientsIsMutable() {
      * @return A list containing the recipients.
      */
     public com.google.protobuf.ProtocolStringList getRecipientsList() {
-      recipients_.makeImmutable();
-      return recipients_;
+      return recipients_.getUnmodifiableView();
     }
     /**
      *
@@ -2808,7 +2782,6 @@ public Builder setRecipients(int index, java.lang.String value) {
       }
       ensureRecipientsIsMutable();
       recipients_.set(index, value);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2832,7 +2805,6 @@ public Builder addRecipients(java.lang.String value) {
       }
       ensureRecipientsIsMutable();
       recipients_.add(value);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2853,7 +2825,6 @@ public Builder addRecipients(java.lang.String value) {
     public Builder addAllRecipients(java.lang.Iterable<java.lang.String> values) {
       ensureRecipientsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, recipients_);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2871,9 +2842,8 @@ public Builder addAllRecipients(java.lang.Iterable<java.lang.String> values) {
      * @return This builder for chaining.
      */
     public Builder clearRecipients() {
-      recipients_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000200);
-      ;
       onChanged();
       return this;
     }
@@ -2898,7 +2868,6 @@ public Builder addRecipientsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRecipientsIsMutable();
       recipients_.add(value);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressOrBuilder.java
index e4822d0d4f..a760feb104 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressOrBuilder.java
@@ -29,7 +29,6 @@ public interface PostalAddressOrBuilder
    * <pre>
    * The schema revision of the `PostalAddress`. This must be set to 0, which is
    * the latest revision.
-   *
    * All new revisions **must** be backward compatible with old revisions.
    * </pre>
    *
@@ -83,10 +82,8 @@ public interface PostalAddressOrBuilder
    * This can affect formatting in certain countries, but is not critical
    * to the correctness of the data and will never affect any validation or
    * other non-formatting related operations.
-   *
    * If this value is not known, it should be omitted (rather than specifying a
    * possibly incorrect default).
-   *
    * Examples: "zh-Hant", "ja", "ja-Latn", "en".
    * </pre>
    *
@@ -106,10 +103,8 @@ public interface PostalAddressOrBuilder
    * This can affect formatting in certain countries, but is not critical
    * to the correctness of the data and will never affect any validation or
    * other non-formatting related operations.
-   *
    * If this value is not known, it should be omitted (rather than specifying a
    * possibly incorrect default).
-   *
    * Examples: "zh-Hant", "ja", "ja-Latn", "en".
    * </pre>
    *
@@ -283,7 +278,6 @@ public interface PostalAddressOrBuilder
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -292,14 +286,12 @@ public interface PostalAddressOrBuilder
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -316,7 +308,6 @@ public interface PostalAddressOrBuilder
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -325,14 +316,12 @@ public interface PostalAddressOrBuilder
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -349,7 +338,6 @@ public interface PostalAddressOrBuilder
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -358,14 +346,12 @@ public interface PostalAddressOrBuilder
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
@@ -383,7 +369,6 @@ public interface PostalAddressOrBuilder
    *
    * <pre>
    * Unstructured address lines describing the lower levels of an address.
-   *
    * Because values in address_lines do not have type information and may
    * sometimes contain multiple values in a single field (e.g.
    * "Austin, TX"), it is important that the line order is clear. The order of
@@ -392,14 +377,12 @@ public interface PostalAddressOrBuilder
    * used to make it explicit (e.g. "ja" for large-to-small ordering and
    * "ja-Latn" or "en" for small-to-large). This way, the most specific line of
    * an address can be selected based on the language.
-   *
    * The minimum permitted structural representation of an address consists
    * of a region_code with all remaining information placed in the
    * address_lines. It would be possible to format such an address very
    * approximately without geocoding, but no semantic reasoning could be
    * made about any of the address components until it was at least
    * partially resolved.
-   *
    * Creating an address only containing a region_code and address_lines, and
    * then geocoding is the recommended way to handle completely unstructured
    * addresses (as opposed to guessing which parts of the address should be
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java
index b607d114ba..95157b0a23 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java
@@ -25,53 +25,41 @@
  * A quaternion is defined as the quotient of two directed lines in a
  * three-dimensional space or equivalently as the quotient of two Euclidean
  * vectors (https://en.wikipedia.org/wiki/Quaternion).
- *
  * Quaternions are often used in calculations involving three-dimensional
  * rotations (https://en.wikipedia.org/wiki/Quaternions_and_spatial_rotation),
  * as they provide greater mathematical robustness by avoiding the gimbal lock
  * problems that can be encountered when using Euler angles
  * (https://en.wikipedia.org/wiki/Gimbal_lock).
- *
  * Quaternions are generally represented in this form:
- *
  *     w + xi + yj + zk
- *
  * where x, y, z, and w are real numbers, and i, j, and k are three imaginary
  * numbers.
- *
  * Our naming choice `(x, y, z, w)` comes from the desire to avoid confusion for
  * those interested in the geometric properties of the quaternion in the 3D
  * Cartesian space. Other texts often use alternative names or subscripts, such
  * as `(a, b, c, d)`, `(1, i, j, k)`, or `(0, 1, 2, 3)`, which are perhaps
  * better suited for mathematical interpretations.
- *
  * To avoid any confusion, as well as to maintain compatibility with a large
  * number of software libraries, the quaternions represented using the protocol
  * buffer below *must* follow the Hamilton convention, which defines `ij = k`
  * (i.e. a right-handed algebra), and therefore:
- *
  *     i^2 = j^2 = k^2 = ijk = −1
  *     ij = −ji = k
  *     jk = −kj = i
  *     ki = −ik = j
- *
  * Please DO NOT use this to represent quaternions that follow the JPL
  * convention, or any of the other quaternion flavors out there.
- *
  * Definitions:
- *
  *   - Quaternion norm (or magnitude): `sqrt(x^2 + y^2 + z^2 + w^2)`.
  *   - Unit (or normalized) quaternion: a quaternion whose norm is 1.
  *   - Pure quaternion: a quaternion whose scalar component (`w`) is 0.
  *   - Rotation quaternion: a unit quaternion used to represent rotation.
  *   - Orientation quaternion: a unit quaternion used to represent orientation.
- *
  * A quaternion can be normalized by dividing it by its norm. The resulting
  * quaternion maintains the same direction, but has a norm of 1, i.e. it moves
  * on the unit sphere. This is generally necessary for rotation and orientation
  * quaternions, to avoid rounding errors:
  * https://en.wikipedia.org/wiki/Rotation_formalisms_in_three_dimensions
- *
  * Note that `(x, y, z, w)` and `(-x, -y, -z, -w)` represent the same rotation,
  * but normalization would be even more useful, e.g. for comparison purposes, if
  * it would produce a unique representation. It is thus recommended that `w` be
@@ -99,6 +87,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Quaternion();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.QuaternionProto.internal_static_google_type_Quaternion_descriptor;
   }
@@ -386,53 +379,41 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * A quaternion is defined as the quotient of two directed lines in a
    * three-dimensional space or equivalently as the quotient of two Euclidean
    * vectors (https://en.wikipedia.org/wiki/Quaternion).
-   *
    * Quaternions are often used in calculations involving three-dimensional
    * rotations (https://en.wikipedia.org/wiki/Quaternions_and_spatial_rotation),
    * as they provide greater mathematical robustness by avoiding the gimbal lock
    * problems that can be encountered when using Euler angles
    * (https://en.wikipedia.org/wiki/Gimbal_lock).
-   *
    * Quaternions are generally represented in this form:
-   *
    *     w + xi + yj + zk
-   *
    * where x, y, z, and w are real numbers, and i, j, and k are three imaginary
    * numbers.
-   *
    * Our naming choice `(x, y, z, w)` comes from the desire to avoid confusion for
    * those interested in the geometric properties of the quaternion in the 3D
    * Cartesian space. Other texts often use alternative names or subscripts, such
    * as `(a, b, c, d)`, `(1, i, j, k)`, or `(0, 1, 2, 3)`, which are perhaps
    * better suited for mathematical interpretations.
-   *
    * To avoid any confusion, as well as to maintain compatibility with a large
    * number of software libraries, the quaternions represented using the protocol
    * buffer below *must* follow the Hamilton convention, which defines `ij = k`
    * (i.e. a right-handed algebra), and therefore:
-   *
    *     i^2 = j^2 = k^2 = ijk = −1
    *     ij = −ji = k
    *     jk = −kj = i
    *     ki = −ik = j
-   *
    * Please DO NOT use this to represent quaternions that follow the JPL
    * convention, or any of the other quaternion flavors out there.
-   *
    * Definitions:
-   *
    *   - Quaternion norm (or magnitude): `sqrt(x^2 + y^2 + z^2 + w^2)`.
    *   - Unit (or normalized) quaternion: a quaternion whose norm is 1.
    *   - Pure quaternion: a quaternion whose scalar component (`w`) is 0.
    *   - Rotation quaternion: a unit quaternion used to represent rotation.
    *   - Orientation quaternion: a unit quaternion used to represent orientation.
-   *
    * A quaternion can be normalized by dividing it by its norm. The resulting
    * quaternion maintains the same direction, but has a norm of 1, i.e. it moves
    * on the unit sphere. This is generally necessary for rotation and orientation
    * quaternions, to avoid rounding errors:
    * https://en.wikipedia.org/wiki/Rotation_formalisms_in_three_dimensions
-   *
    * Note that `(x, y, z, w)` and `(-x, -y, -z, -w)` represent the same rotation,
    * but normalization would be even more useful, e.g. for comparison purposes, if
    * it would produce a unique representation. It is thus recommended that `w` be
@@ -522,6 +503,39 @@ private void buildPartial0(com.google.type.Quaternion result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.Quaternion) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
index cddb42c5b9..0a0e46f926 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TimeOfDay();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_descriptor;
   }
@@ -409,6 +414,39 @@ private void buildPartial0(com.google.type.TimeOfDay result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.TimeOfDay) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java
index 65b04f06c4..372d9e7039 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java
@@ -49,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TimeZone();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DateTimeProto.internal_static_google_type_TimeZone_descriptor;
   }
@@ -410,6 +415,39 @@ private void buildPartial0(com.google.type.TimeZone result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.type.TimeZone) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto
index 6d01954eee..d542de9e2f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto
+++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto
@@ -307,7 +307,7 @@ message MethodSettings {
   // long-running operation pattern.
   // All default values below are from those used in the client library
   // generators (e.g.
-  // [Java](https://github.com/googleapis/gapic-generator-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
+  // [Java](https://github.com/googleapis/sdk-platform-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
   message LongRunning {
     // Initial delay after which the first poll request will be made.
     // Default value: 5 seconds.